bug 831354 - test fix 6 - canvas and svg language-font tests pass on android with the Open Sans font prefs. r=dbaron
☠☠ backed out by d670603dc3c2 ☠ ☠
authorJonathan Kew <jkew@mozilla.com>
Fri, 18 Jan 2013 23:03:13 +0000
changeset 119312 823ab8a1c9c0b4886027e1e7df3cf0a37e18a5a9
parent 119311 ea3d953f806d99f047908eb74d18699048116b85
child 119313 4d919195cdf07423396a0b8ff4d0069da1bb8375
push id24195
push userMs2ger@gmail.com
push dateSat, 19 Jan 2013 16:10:11 +0000
treeherdermozilla-central@02e12a80aef9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdbaron
bugs831354
milestone21.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 831354 - test fix 6 - canvas and svg language-font tests pass on android with the Open Sans font prefs. r=dbaron
layout/reftests/canvas/reftest.list
layout/reftests/svg/reftest.list
layout/reftests/svg/text-language-01.xhtml
--- a/layout/reftests/canvas/reftest.list
+++ b/layout/reftests/canvas/reftest.list
@@ -38,17 +38,17 @@ skip-if(B2G) asserts-if(cocoaWidget,0-2)
 == text-no-frame-test.html text-no-frame-ref.html
 == text-no-frame-2-test.html text-not-in-doc-ref.html
 == text-not-in-doc-test.html text-not-in-doc-ref.html
 
 == text-bidi-ltr-test.html text-bidi-ltr-ref.html
 != text-bidi-ltr-test.html text-bidi-ltr-notref.html # for bug 698185
 == text-bidi-rtl-test.html text-bidi-rtl-ref.html
 
-fails-if(Android||B2G) != text-font-lang.html text-font-lang-notref.html
+fails-if(B2G) != text-font-lang.html text-font-lang-notref.html
 
 == text-measure.html text-measure-ref.html
 
 == strokeText-path.html strokeText-path-ref.html
 
 # check that emoji character renders as something non-blank (for Apple Color Emoji font, bug 715798)
 # apparently fails on some 10.7 systems for unknown reasons, bug 804522.
 random-if(OSX==10.7) != text-emoji.html text-emoji-notref.html
--- a/layout/reftests/svg/reftest.list
+++ b/layout/reftests/svg/reftest.list
@@ -266,18 +266,18 @@ random-if(gtk2Widget) == text-font-weigh
 == text-gradient-01.svg text-gradient-01-ref.svg
 random-if(winWidget) == text-gradient-02.svg text-gradient-02-ref.svg # see bug 590101
 == text-gradient-03.svg pass.svg
 HTTP(..) == text-gradient-04.svg text-gradient-04-ref.svg
 == 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.
-skip-if(B2G) fails-if(Android) != text-language-00.xhtml text-language-00-ref.xhtml
-skip-if(B2G) fails-if(Android) random-if(gtk2Widget) != text-language-01.xhtml text-language-01-ref.xhtml # Fails on Linux tryserver due to lack of CJK fonts.
+skip-if(B2G) != text-language-00.xhtml text-language-00-ref.xhtml
+skip-if(B2G) random-if(gtk2Widget) != text-language-01.xhtml text-language-01-ref.xhtml # Fails on Linux tryserver due to lack of CJK fonts.
 fuzzy-if(OSX==10.8,46,26) == text-layout-01.svg text-layout-01-ref.svg
 == text-layout-02.svg text-layout-02-ref.svg
 == text-layout-03.svg text-layout-03-ref.svg
 == text-layout-04.svg text-layout-04-ref.svg
 == text-layout-05.svg text-layout-05-ref.svg
 fuzzy-if(cocoaWidget&&layersGPUAccelerated,1,3) == text-layout-06.svg text-layout-06-ref.svg
 == text-layout-07.svg text-layout-07-ref.svg
 == text-scale-01.svg text-scale-01-ref.svg
--- a/layout/reftests/svg/text-language-01.xhtml
+++ b/layout/reftests/svg/text-language-01.xhtml
@@ -13,17 +13,17 @@ div {
 }
 </style>
 </head>
 
 <!-- The reference is tagged as "en", the test cases as other languages.
      Expectation is that these will have different default fonts,
      so the test and reference should NOT match. -->
 <body>
-<div lang="en" style="height:100px">
+<div lang="ar" style="height:100px">
   <svg xmlns="http://www.w3.org/2000/svg" height="200">
     <text y="50">Hello world, 你好吗?</text>
   </svg>
 </div>
 <div lang="zh-TW" style="height:100px">
   <svg xmlns="http://www.w3.org/2000/svg" height="200">
     <text y="50">Hello world, 你好吗?</text>
   </svg>