Bug 1573249 - patch 3 - Add reftests for ignoring skip-ink behavior on CJK text. r=dholbert
☠☠ backed out by d7d41033f561 ☠ ☠
authorJonathan Kew <jkew@mozilla.com>
Wed, 21 Aug 2019 09:39:02 +0000
changeset 489151 bdba80dae6e2e2ae62405f8d9a723d3a2834ef9e
parent 489150 21306e3f8d31af3d1957415acbe5ca1425cddb1a
child 489152 63dc43dba90a00922b7fa994193fa8729e2e3ea4
push id36465
push userdvarga@mozilla.com
push dateWed, 21 Aug 2019 16:47:43 +0000
treeherdermozilla-central@4ab60925635c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdholbert
bugs1573249
milestone70.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1573249 - patch 3 - Add reftests for ignoring skip-ink behavior on CJK text. r=dholbert Differential Revision: https://phabricator.services.mozilla.com/D42683
layout/reftests/text-decoration/reftest.list
layout/reftests/text-decoration/skip-ink-cjk-1-ref.html
layout/reftests/text-decoration/skip-ink-cjk-1.html
layout/reftests/text-decoration/skip-ink-cjk-2-ref.html
layout/reftests/text-decoration/skip-ink-cjk-2.html
layout/reftests/text-decoration/skip-ink-cjk-3-ref.html
layout/reftests/text-decoration/skip-ink-cjk-3.html
--- a/layout/reftests/text-decoration/reftest.list
+++ b/layout/reftests/text-decoration/reftest.list
@@ -113,8 +113,11 @@ fuzzy-if(skiaContent,0-4,0-2) == underli
 == vertical-mode-decorations-1.html vertical-mode-decorations-1-ref.html
 fuzzy-if(Android,0-238,0-36) == vertical-mode-decorations-2.html vertical-mode-decorations-2-ref.html
 != 1415214.html 1415214-notref.html
 test-pref(layout.css.text-decoration-thickness.enabled,false) == text-decoration-shorthands-001.html text-decoration-shorthands-001-ref.html
 # fails because of bug 1572302
 test-pref(layout.css.text-decoration-skip-ink.enabled,true) test-pref(layout.css.text-underline-offset.enabled,true) fails HTTP(..) == skip-ink-multiline-position.html skip-ink-multiline-position-ref.html
 # fails due to bug 1573711
 test-pref(layout.css.text-decoration-skip-ink.enabled,true) fails == skip-ink-vertical-align.html skip-ink-vertical-align-ref.html
+pref(layout.css.text-decoration-skip-ink.enabled,true) fuzzy(0-94,0-4) == skip-ink-cjk-1.html skip-ink-cjk-1-ref.html
+pref(layout.css.text-decoration-skip-ink.enabled,true) == skip-ink-cjk-2.html skip-ink-cjk-2-ref.html
+pref(layout.css.text-decoration-skip-ink.enabled,true) == skip-ink-cjk-3.html skip-ink-cjk-3-ref.html
new file mode 100644
--- /dev/null
+++ b/layout/reftests/text-decoration/skip-ink-cjk-1-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="ja">
+<meta charset="utf-8">
+<style>
+body {
+  font: 16px/2 sans-serif;
+}
+.test {
+  font: 32px sans-serif;
+  text-decoration: 2px red underline;
+  text-underline-offset: 1px;
+}
+span {
+  text-decoration-skip-ink: none;
+}
+</style>
+<div>The underline should skip descenders on the English but not the Japanese:</div>
+<div class=test>skipping <span>土砂災害警戒情報</span> skipping</div>
new file mode 100644
--- /dev/null
+++ b/layout/reftests/text-decoration/skip-ink-cjk-1.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html lang="ja">
+<meta charset="utf-8">
+<style>
+body {
+  font: 16px/2 sans-serif;
+}
+.test {
+  font: 32px sans-serif;
+  text-decoration: 2px red underline;
+  text-underline-offset: 1px;
+}
+</style>
+<div>The underline should skip descenders on the English but not the Japanese:</div>
+<div class=test>skipping 土砂災害警戒情報 skipping</div>
new file mode 100644
--- /dev/null
+++ b/layout/reftests/text-decoration/skip-ink-cjk-2-ref.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="ja">
+<!-- lang=ja will cause the default japanese font to be used throughout -->
+<meta charset="utf-8">
+<style>
+body {
+  font: 16px/2 sans-serif;
+}
+.test {
+  font: 32px sans-serif;
+  text-decoration: 2px red underline;
+  text-underline-offset: -1px; /* make underline clash with digits etc */
+  text-decoration-skip-ink: none;
+}
+</style>
+<div>The underline should not skip-ink in Japanese runs, even on embedded "common" characters:</div>
+<div class=test>黄砂情報 実況図 / 予測図</div>
+<div class=test>気象衛星 10分ごと / 2.5分ごと</div>
+<div class=test>レーダー•ナウキャスト(降水•雷•竜巻)</div>
new file mode 100644
--- /dev/null
+++ b/layout/reftests/text-decoration/skip-ink-cjk-2.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="ja">
+<!-- lang=ja will cause the default japanese font to be used throughout -->
+<meta charset="utf-8">
+<style>
+body {
+  font: 16px/2 sans-serif;
+}
+.test {
+  font: 32px sans-serif;
+  text-decoration: 2px red underline;
+  text-underline-offset: -1px; /* make underline clash with digits etc */
+}
+</style>
+<div>The underline should not skip-ink in Japanese runs, even on embedded "common" characters:</div>
+<div class=test>黄砂情報 実況図 / 予測図</div>
+<div class=test>気象衛星 10分ごと / 2.5分ごと</div>
+<div class=test>レーダー•ナウキャスト(降水•雷•竜巻)</div>
new file mode 100644
--- /dev/null
+++ b/layout/reftests/text-decoration/skip-ink-cjk-3-ref.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+<!-- lang=en will result in a mix of western and japanese fonts -->
+<meta charset="utf-8">
+<style>
+body {
+  font: 16px/2 sans-serif;
+}
+.test {
+  font: 32px sans-serif;
+  text-decoration: 2px red underline;
+  text-underline-offset: -1px; /* make underline clash with digits etc */
+  text-decoration-skip-ink: none;
+}
+</style>
+<div>The underline should not skip-ink in Japanese runs, even on embedded "common" characters:</div>
+<div class=test>黄砂情報 実況図 / 予測図</div>
+<div class=test>気象衛星 10分ごと / 2.5分ごと</div>
+<div class=test>レーダー•ナウキャスト(降水•雷•竜巻)</div>
new file mode 100644
--- /dev/null
+++ b/layout/reftests/text-decoration/skip-ink-cjk-3.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en">
+<!-- lang=en will result in a mix of western and japanese fonts -->
+<meta charset="utf-8">
+<style>
+body {
+  font: 16px/2 sans-serif;
+}
+.test {
+  font: 32px sans-serif;
+  text-decoration: 2px red underline;
+  text-underline-offset: -1px; /* make underline clash with digits etc */
+}
+</style>
+<div>The underline should not skip-ink in Japanese runs, even on embedded "common" characters:</div>
+<div class=test>黄砂情報 実況図 / 予測図</div>
+<div class=test>気象衛星 10分ごと / 2.5分ごと</div>
+<div class=test>レーダー•ナウキャスト(降水•雷•竜巻)</div>