bug 569531 - enable harfbuzz by default on windows. r=roc approval2.0=roc
authorJonathan Kew <jfkthame@gmail.com>
Thu, 02 Sep 2010 12:28:48 +0100
changeset 51886 dc2939f2640dc3d46cf1ee99fad45e171e100b4f
parent 51885 0d05f0b5bfd4a17e804b9b8a04022a5524433f86
child 51887 5fe0dbcf9d39f65a3fe1d4db53ab5fc1bc0a6345
push id15464
push userjkew@mozilla.com
push dateThu, 02 Sep 2010 11:31:52 +0000
treeherdermozilla-central@dc2939f2640d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc
bugs569531
milestone2.0b6pre
first release with
nightly linux32
dc2939f2640d / 4.0b6pre / 20100902044413 / files
nightly linux64
dc2939f2640d / 4.0b6pre / 20100902045721 / files
nightly mac
dc2939f2640d / 4.0b6pre / 20100902045114 / files
nightly win32
dc2939f2640d / 4.0b6pre / 20100902095949 / files
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
bug 569531 - enable harfbuzz by default on windows. r=roc approval2.0=roc
layout/reftests/bidi/reftest.list
layout/reftests/font-features/reftest.list
layout/reftests/svg/reftest.list
modules/libpref/src/init/all.js
--- a/layout/reftests/bidi/reftest.list
+++ b/layout/reftests/bidi/reftest.list
@@ -26,20 +26,20 @@ random-if(gtk2Widget) == mixedChartype-0
 random-if(gtk2Widget) == mixedChartype-03-j.html mixedChartype-03-ref.html
 == with-first-letter-1a.html with-first-letter-1-ref.html
 == with-first-letter-1b.html with-first-letter-1-ref.html
 == with-first-letter-2a.html with-first-letter-2-ref.html
 == with-first-letter-2b.html with-first-letter-2-ref.html
 == 115921-1.html 115921-1-ref.html
 == 115921-2.html 115921-2-ref.html
 == 258928-1.html 258928-1-ref.html
-== 267459-1.html 267459-1-ref.html
+random-if(winWidget) == 267459-1.html 267459-1-ref.html # depends on windows version, see bug 590101
 == 267459-2.html 267459-2-ref.html
 == 299065-1.html 299065-1-ref.html
-== 305643-1.html 305643-1-ref.html
+random-if(winWidget) == 305643-1.html 305643-1-ref.html # depends on windows version, see bug 590101
 == 332655-1.html 332655-1-ref.html
 == 332655-2.html 332655-2-ref.html
 == 381279-1.html 381279-1-ref.html
 random-if(gtk2Widget) == 386339.html 386339-ref.html
 == 409375.html 409375-ref.html
 == 413542-1.html 413542-1-ref.html
 == 413542-2.html 413542-2-ref.html
 == 413928-1.html 413928-1-ref.html
--- a/layout/reftests/font-features/reftest.list
+++ b/layout/reftests/font-features/reftest.list
@@ -2,29 +2,27 @@
 #
 # These rely on the Linux Libertine font (loaded via @font-face)
 # to ensure that features are present.
 
 # Feature support is currently enabled only on Mac OS X by default
 
 # check that Turkish language causes a change in rendering (no fi ligature)
 # (also works via Pango)
-# marking as random on windows until we turn on harfbuzz, because behavior depends on uniscribe version
-random-if(winWidget) HTTP(..) != font-features-turkish.html font-features-ref.html
+HTTP(..) != font-features-turkish.html font-features-ref.html
 
 # check that disabling ligatures causes a change
-fails-if(!cocoaWidget) HTTP(..) != font-features-noliga.html font-features-ref.html
+fails-if(gtk2Widget) HTTP(..) != font-features-noliga.html font-features-ref.html
 
 # check that enabling optional ligatures causes a change
-fails-if(!cocoaWidget) HTTP(..) != font-features-hlig.html font-features-ref.html
+fails-if(gtk2Widget) HTTP(..) != font-features-hlig.html font-features-ref.html
 
 # compare Turkish rendering with reference using ZWNJ to break the ligature
 # (also works via Pango)
-# marking as random on windows until we turn on harfbuzz, because behavior depends on uniscribe version
-random-if(winWidget) HTTP(..) == font-features-turkish.html font-features-turkish-ref.html
+HTTP(..) == font-features-turkish.html font-features-turkish-ref.html
 
 # compare Turkish rendering with explicitly disabled ligatures
 # (fails on Linux because Pango recognizes the Turkish lang but not the feature setting)
 fails-if(gtk2Widget) HTTP(..) == font-features-turkish.html font-features-noliga.html
 
 # The following should pass even if feature support isn't available,
 # because both testcase and reference will have the default rendering,
 # though they're not really meaningful unless the tests above passed already.
--- a/layout/reftests/svg/reftest.list
+++ b/layout/reftests/svg/reftest.list
@@ -145,17 +145,17 @@ fails-if(gtk2Widget) == objectBoundingBo
 == stroke-width-percentage-01.svg pass.svg
 == style-property-not-on-script-element-01.svg pass.svg
 == style-without-type-attribute.svg pass.svg
 == svg-in-foreignObject-01.xhtml svg-in-foreignObject-01-ref.xhtml
 == svg-in-foreignObject-02.xhtml svg-in-foreignObject-01-ref.xhtml # reuse -01-ref.xhtml
 random-if(gtk2Widget) == text-font-weight-01.svg text-font-weight-01-ref.svg # bug 386713
 == switch-01.svg pass.svg
 == text-gradient-01.svg text-gradient-01-ref.svg
-== text-gradient-02.svg text-gradient-02-ref.svg
+random-if(winWidget) == text-gradient-02.svg text-gradient-02-ref.svg # see bug 590101
 == text-in-link-01.svg text-in-link-01-ref.svg
 == text-in-link-02.svg text-in-link-02-ref.svg
 == text-in-link-03.svg text-in-link-03-ref.svg
 # Tests for bug 546813: sanity-check using HTML text, then test SVG behavior.
 != text-language-00.xhtml text-language-00-ref.xhtml
 random-if(gtk2Widget) != text-language-01.xhtml text-language-01-ref.xhtml # Fails on Linux tryserver due to lack of CJK fonts.
 == text-layout-01.svg text-layout-01-ref.svg
 == text-layout-02.svg text-layout-02-ref.svg
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -178,21 +178,17 @@ pref("media.autoplay.enabled", true);
 pref("gfx.color_management.mode", 2);
 pref("gfx.color_management.display_profile", "");
 pref("gfx.color_management.rendering_intent", 0);
 
 pref("gfx.3d_video.enabled", false);
 
 pref("gfx.downloadable_fonts.enabled", true);
 
-#ifdef XP_MACOSX
 pref("gfx.font_rendering.harfbuzz.level", 1);
-#else
-pref("gfx.font_rendering.harfbuzz.level", 0);
-#endif
 
 #ifdef XP_WIN
 #ifndef WINCE
 pref("gfx.font_rendering.directwrite.enabled", false);
 #endif
 #endif
 
 pref("accessibility.browsewithcaret", false);