Back out ac6dff6a0811 and f97bc1de213a (bug 700022) for permaorange in b2g R6
authorPhil Ringnalda <philringnalda@gmail.com>
Fri, 22 Feb 2013 22:26:24 -0800
changeset 122728 5f688e2b37dccad4022bede8f5fdd199a8c2db1e
parent 122727 76f5d877e6f6638cd061e703d27ce2d4e1e5ee23
child 122729 d339d3b173d42b7a23301977c02a2c529890b7cc
push id24356
push usergszorc@mozilla.com
push dateSun, 24 Feb 2013 01:00:12 +0000
treeherdermozilla-central@195e706140d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs700022
milestone22.0a1
backs outac6dff6a0811708d1f58af1078c7bae17da5878d
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
Back out ac6dff6a0811 and f97bc1de213a (bug 700022) for permaorange in b2g R6
layout/reftests/fonts/sil/Padauk.ttf
layout/reftests/fonts/sil/PigLatin-nographite.ttf
layout/reftests/fonts/sil/PigLatinBenchmark_v3.ttf
layout/reftests/text/graphite-01-ref.html
layout/reftests/text/graphite-01.html
layout/reftests/text/graphite-02-ref.html
layout/reftests/text/graphite-02.html
layout/reftests/text/graphite-03-notref.html
layout/reftests/text/graphite-03a.html
layout/reftests/text/graphite-03b.html
layout/reftests/text/graphite-04-fa.html
layout/reftests/text/graphite-04-ref.html
layout/reftests/text/graphite-04-sd.html
layout/reftests/text/graphite-04-snd.html
layout/reftests/text/graphite-04-ur.html
layout/reftests/text/graphite-04-urd.html
layout/reftests/text/reftest.list
deleted file mode 100644
index 68958e98fdb6cf1c1233c2ff19531f81e42f9cc2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 359c0adfb082ecb8dddbbb3ba81105bd15824abc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100755
index 411935215aa82b507f56319ab83c51a1e40966c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/layout/reftests/text/graphite-01-ref.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<style type="text/css">
-@font-face {
-  font-family: PigLatin;
-  src: url(../fonts/sil/PigLatin-nographite.ttf);
-}
-
-body {
-  font: 34px PigLatin;
-  width: 5em;
-  line-height: 2em;
-}
-</style>
-</head>
-<body>
-<p>
-Igpay
-</p>
-</body>
-</html>
deleted file mode 100644
--- a/layout/reftests/text/graphite-01.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<style type="text/css">
-@font-face {
-  font-family: PigLatin;
-  src: url(../fonts/sil/PigLatinBenchmark_v3.ttf);
-}
-
-body {
-  font: 34px PigLatin;
-  width: 5em;
-  line-height: 2em;
-}
-</style>
-</head>
-<body>
-<p>
-Pig
-</p>
-</body>
-</html>
deleted file mode 100644
--- a/layout/reftests/text/graphite-02-ref.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<style type="text/css">
-@font-face {
-  font-family: PigLatin;
-  src: url(../fonts/sil/PigLatin-nographite.ttf);
-}
-
-body {
-  font: 34px PigLatin;
-  width: 5em;
-  line-height: 2em;
-}
-</style>
-</head>
-<body>
-<p>
-Igpay<br>Atinlay
-</p>
-</body>
-</html>
deleted file mode 100644
--- a/layout/reftests/text/graphite-02.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<style type="text/css">
-@font-face {
-  font-family: PigLatin;
-  src: url(../fonts/sil/PigLatinBenchmark_v3.ttf);
-}
-
-body {
-  font: 34px PigLatin;
-  width: 5em;
-  line-height: 2em;
-}
-</style>
-</head>
-<body>
-<p>
-Pig Latin
-</p>
-</body>
-</html>
deleted file mode 100644
--- a/layout/reftests/text/graphite-03-notref.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<style type="text/css">
-@font-face {
-  font-family: padauk;
-  src: url(../fonts/sil/Padauk.ttf);
-}
-
-body {
-  font: 34px padauk;
-}
-</style>
-</head>
-<body>
-<p lang="my"><!-- default (Burmese) behavior of Padauk -->
-ပှၤလၢအတလဲၤဘၣ်ဝဲလၢ ပှၤတတီတလိၤဘၣ်အ ကူၣ်ထီၣ်ဖးလီၤတၢ်အပူၤ, ဒီးတဆၢထၢၣ်ဘၣ်ဝဲလၢ ပှၤမၤတၢ်ဒဲးဘးအကျဲ, ဒီးတဆ့ၣ်နီၤဘၣ်ဝဲလၢ ပှၤ ဒုၣ်ဒွဲၣ်တၢ်အလီၢ်ဆ့ၣ်နီၤဘၣ်န့ၣ် ဘၣ်ဆိၣ်ဂ့ၤဝဲလီၤ.
-</p>
-</body>
-</html>
deleted file mode 100644
--- a/layout/reftests/text/graphite-03a.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<style type="text/css">
-@font-face {
-  font-family: padauk;
-  src: url(../fonts/sil/Padauk.ttf);
-}
-
-body {
-  font: 34px padauk;
-}
-</style>
-</head>
-<body>
-<p lang="ksw"><!-- check that changing language affects the rendering:
-                   this modifies the shape of a couple of lower diacritics -->
-ပှၤလၢအတလဲၤဘၣ်ဝဲလၢ ပှၤတတီတလိၤဘၣ်အ ကူၣ်ထီၣ်ဖးလီၤတၢ်အပူၤ, ဒီးတဆၢထၢၣ်ဘၣ်ဝဲလၢ ပှၤမၤတၢ်ဒဲးဘးအကျဲ, ဒီးတဆ့ၣ်နီၤဘၣ်ဝဲလၢ ပှၤ ဒုၣ်ဒွဲၣ်တၢ်အလီၢ်ဆ့ၣ်နီၤဘၣ်န့ၣ် ဘၣ်ဆိၣ်ဂ့ၤဝဲလီၤ.
-</p>
-</body>
-</html>
deleted file mode 100644
--- a/layout/reftests/text/graphite-03b.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<style type="text/css">
-@font-face {
-  font-family: padauk;
-  src: url(../fonts/sil/Padauk.ttf);
-}
-
-body {
-  font: 34px padauk;
-  -moz-font-feature-settings: "kdot" on;
-  font-feature-settings: "kdot" on;
-    /* check that setting an optional graphite feature affects rendering:
-     * this adds "dots" to the ends of a number of curved strokes
-     */
-}
-</style>
-</head>
-<body>
-<p lang="my">
-ပှၤလၢအတလဲၤဘၣ်ဝဲလၢ ပှၤတတီတလိၤဘၣ်အ ကူၣ်ထီၣ်ဖးလီၤတၢ်အပူၤ, ဒီးတဆၢထၢၣ်ဘၣ်ဝဲလၢ ပှၤမၤတၢ်ဒဲးဘးအကျဲ, ဒီးတဆ့ၣ်နီၤဘၣ်ဝဲလၢ ပှၤ ဒုၣ်ဒွဲၣ်တၢ်အလီၢ်ဆ့ၣ်နီၤဘၣ်န့ၣ် ဘၣ်ဆိၣ်ဂ့ၤဝဲလီၤ.
-</p>
-</body>
-</html>
deleted file mode 100644
--- a/layout/reftests/text/graphite-04-fa.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<head>
-<meta charset="utf-8">
-<style type="text/css">
-@font-face {
-  font-family: schz-gr;
-  src: url("../fonts/sil/Scheherazade-R 2012-07-03c.ttf");
-}
-body {
-  font-family: schz-gr;
-  font-size: 40px;
-}
-</style>
-</head>
-<body lang="fa">
-<!-- Persian (Farsi) should be the same as English-tagged -->
-&#x6f0;&#x6f1;&#x6f2;&#x6f3;&#x6f4;&#x6f5;&#x6f6;&#x6f7;&#x6f8;&#x6f9;
-</body>
-</html>
deleted file mode 100644
--- a/layout/reftests/text/graphite-04-ref.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<head>
-<meta charset="utf-8">
-<style type="text/css">
-@font-face {
-  font-family: schz-gr;
-  src: url("../fonts/sil/Scheherazade-R 2012-07-03c.ttf");
-}
-body {
-  font-family: schz-gr;
-  font-size: 40px;
-}
-</style>
-</head>
-<body lang="en">
-<!-- for testing Graphite language support we'll use the Eastern Arabic-Indic digits;
-     default rendering will have the Persian forms -->
-&#x6f0;&#x6f1;&#x6f2;&#x6f3;&#x6f4;&#x6f5;&#x6f6;&#x6f7;&#x6f8;&#x6f9;
-</body>
-</html>
deleted file mode 100644
--- a/layout/reftests/text/graphite-04-sd.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<head>
-<meta charset="utf-8">
-<style type="text/css">
-@font-face {
-  font-family: schz-gr;
-  src: url("../fonts/sil/Scheherazade-R 2012-07-03c.ttf");
-}
-body {
-  font-family: schz-gr;
-  font-size: 40px;
-}
-</style>
-</head>
-<body lang="sd">
-<!-- Sindhi - digits 6 and 7 have different forms -->
-&#x6f0;&#x6f1;&#x6f2;&#x6f3;&#x6f4;&#x6f5;&#x6f6;&#x6f7;&#x6f8;&#x6f9;
-</body>
-</html>
deleted file mode 100644
--- a/layout/reftests/text/graphite-04-snd.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<head>
-<meta charset="utf-8">
-<style type="text/css">
-@font-face {
-  font-family: schz-gr;
-  src: url("../fonts/sil/Scheherazade-R 2012-07-03c.ttf");
-}
-body {
-  font-family: schz-gr;
-  font-size: 40px;
-}
-</style>
-</head>
-<body lang="snd">
-<!-- Sindhi incorrectly tagged with iso-639-3 code instead of bcp47/iso-639-1;
-     rendering should therefore match the default "en", NOT the correctly-tagged "sd" version -->
-&#x6f0;&#x6f1;&#x6f2;&#x6f3;&#x6f4;&#x6f5;&#x6f6;&#x6f7;&#x6f8;&#x6f9;
-</body>
-</html>
deleted file mode 100644
--- a/layout/reftests/text/graphite-04-ur.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<head>
-<meta charset="utf-8">
-<style type="text/css">
-@font-face {
-  font-family: schz-gr;
-  src: url("../fonts/sil/Scheherazade-R 2012-07-03c.ttf");
-}
-body {
-  font-family: schz-gr;
-  font-size: 40px;
-}
-</style>
-</head>
-<body lang="ur">
-<!-- in Urdu, the digit 4 should differ from Sindhi,
-     and 6 and 7 also differ from Persian -->
-&#x6f0;&#x6f1;&#x6f2;&#x6f3;&#x6f4;&#x6f5;&#x6f6;&#x6f7;&#x6f8;&#x6f9;
-</body>
-</html>
deleted file mode 100644
--- a/layout/reftests/text/graphite-04-urd.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<head>
-<meta charset="utf-8">
-<style type="text/css">
-@font-face {
-  font-family: schz-gr;
-  src: url("../fonts/sil/Scheherazade-R 2012-07-03c.ttf");
-}
-body {
-  font-family: schz-gr;
-  font-size: 40px;
-}
-</style>
-</head>
-<body lang="urd">
-<!-- incorrectly-tagged Urdu should match the default rendering -->
-&#x6f0;&#x6f1;&#x6f2;&#x6f3;&#x6f4;&#x6f5;&#x6f6;&#x6f7;&#x6f8;&#x6f9;
-</body>
-</html>
--- a/layout/reftests/text/reftest.list
+++ b/layout/reftests/text/reftest.list
@@ -165,45 +165,24 @@ skip-if(B2G) == 726392-3.html 726392-3-r
 == 745555-2.html 745555-2-ref.html
 == 820255.html 820255-ref.html
 
 # ensure emoji chars don't render blank (bug 715798, bug 779042);
 # should at least render hexboxes if there's no font support
 != emoji-01.html emoji-01-notref.html
 != emoji-02.html emoji-02-notref.html
 
-# check that Graphite shaping (bug 631479) is working
-pref(gfx.font_rendering.graphite.enabled,true) HTTP(..) == graphite-01.html graphite-01-ref.html
-# Test 02 (using Pig Latin) is fuzzy on Win7 because glyph positioning is not guaranteed to match exactly
-# between a sequence of simple glyphs rendered individually, and the same sequence treated as a single cluster.
-fuzzy-if(winWidget,43,220) pref(gfx.font_rendering.graphite.enabled,true) HTTP(..) == graphite-02.html graphite-02-ref.html
-pref(gfx.font_rendering.graphite.enabled,true) HTTP(..) != graphite-03a.html graphite-03-notref.html
-pref(gfx.font_rendering.graphite.enabled,true) HTTP(..) != graphite-03b.html graphite-03-notref.html
-pref(gfx.font_rendering.graphite.enabled,false) HTTP(..) != graphite-01.html graphite-01-ref.html
-pref(gfx.font_rendering.graphite.enabled,false) HTTP(..) != graphite-02.html graphite-02-ref.html
-# test 03a (lang setting in Padauk font) now works in opentype/harfbuzz as well, but not on Windows (using Uniscribe/DirectWrite)
-fails-if(winWidget) pref(gfx.font_rendering.graphite.enabled,false) HTTP(..) != graphite-03a.html graphite-03-notref.html
-pref(gfx.font_rendering.graphite.enabled,false) HTTP(..) == graphite-03b.html graphite-03-notref.html
-
-# tests for graphite rendering with valid and invalid lang tags
-pref(gfx.font_rendering.graphite.enabled,true) HTTP(..) == graphite-04-fa.html graphite-04-ref.html
-pref(gfx.font_rendering.graphite.enabled,true) HTTP(..) != graphite-04-sd.html graphite-04-ref.html
-pref(gfx.font_rendering.graphite.enabled,true) HTTP(..) == graphite-04-snd.html graphite-04-ref.html
-pref(gfx.font_rendering.graphite.enabled,true) HTTP(..) != graphite-04-ur.html graphite-04-ref.html
-pref(gfx.font_rendering.graphite.enabled,true) HTTP(..) == graphite-04-urd.html graphite-04-ref.html
-pref(gfx.font_rendering.graphite.enabled,true) HTTP(..) != graphite-04-sd.html graphite-04-ur.html
-
 # tests to compare graphite to opentype (will trivially pass when graphite not enabled)
 HTTP(..) == graphite-05-ot-only.html graphite-05-ref.html
-HTTP(..) != graphite-05-ot-only.html graphite-05-fail.html
+skip-if(B2G) HTTP(..) != graphite-05-ot-only.html graphite-05-fail.html
 HTTP(..) == graphite-05-simple.html graphite-05-ref.html
 HTTP(..) == graphite-05-multipass.html graphite-05-ref.html
-HTTP(..) == graphite-05-lang.html graphite-05-ref.html
-HTTP(..) == graphite-05-badlang.html graphite-05-ref.html
-HTTP(..) == graphite-05-feat.html graphite-05-ref.html
+skip-if(B2G) HTTP(..) == graphite-05-lang.html graphite-05-ref.html
+skip-if(B2G) HTTP(..) == graphite-05-badlang.html graphite-05-ref.html
+skip-if(B2G) HTTP(..) == graphite-05-feat.html graphite-05-ref.html
 
 # comparing composed and decomposed characters that should render identically
 # under both OpenType and Graphite shaping
 pref(gfx.font_rendering.graphite.enabled,false) HTTP(..) == glyph-decomposition-opentype.html glyph-decomposition-opentype-ref.html
 pref(gfx.font_rendering.graphite.enabled,true) HTTP(..) == glyph-decomposition-graphite.html glyph-decomposition-graphite-ref.html
 
 # Tests for hyphenation with -moz-hyphens
 == auto-hyphenation-1.html auto-hyphenation-1-ref.html