bug 831354 - test fix 7 - explicitly use Droid Serif for the greek-uppercase-1 test on Android, as default fonts may not be suitable. r=dbaron
authorJonathan Kew <jkew@mozilla.com>
Sat, 19 Jan 2013 10:29:54 +0000
changeset 119349 47b719f586030979b7d099302cfb439b4e015970
parent 119348 a523c072eceddc0cae30099551d77e3a7cab01cb
child 119350 b1d4081f058245c09063db9ce54d94e17d87a1d1
push id21625
push userjkew@mozilla.com
push dateSat, 19 Jan 2013 10:31:29 +0000
treeherdermozilla-inbound@b1d4081f0582 [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 7 - explicitly use Droid Serif for the greek-uppercase-1 test on Android, as default fonts may not be suitable. r=dbaron
layout/reftests/text-transform/greek-uppercase-1-ref.html
layout/reftests/text-transform/greek-uppercase-1.html
--- a/layout/reftests/text-transform/greek-uppercase-1-ref.html
+++ b/layout/reftests/text-transform/greek-uppercase-1-ref.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <html>
 <head>
 <title>Test for uppercasing of Greek (NFC)</title>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <style type="text/css">
 div {
-  font: 150% serif;
+  font: 150% "Droid Serif", serif; /* explicitly prefer Droid over Charis on Android */
   margin: 1em;
 }
 </style>
 </head>
 <body lang="en">
 <div>ΠΑΤΆΤΑ, ΑΈΡΑΣ, ΜΆΙΟΣ, ΆΥΛΟΣ, ΑΫΠΝΊΑ, ΜΑΪ&#x301;ΟΥ, ΧΟΎΙ</div>
 <div lang="el">ΠΑΤΑΤΑ, ΑΕΡΑΣ, ΜΑΪΟΣ, ΑΫΛΟΣ, ΑΫΠΝΙΑ, ΜΑΪΟΥ, ΧΟΥΙ</div>
 </body>
--- a/layout/reftests/text-transform/greek-uppercase-1.html
+++ b/layout/reftests/text-transform/greek-uppercase-1.html
@@ -1,16 +1,20 @@
 <!DOCTYPE html>
 <html>
 <head>
 <title>Test for uppercasing of Greek (NFC)</title>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <style type="text/css">
+/* Note that this test depends on finding the same "serif" font for the
+   English- and Greek-tagged elements; on most platforms, our default prefs
+   provide that, but on Android they currently differ, hence the explicit
+   Droid Serif setting below. */
 div {
-  font: 150% serif;
+  font: 150% "Droid Serif", serif; /* explicitly prefer Droid over Charis on Android */
   text-transform: uppercase;
   margin: 1em;
 }
 </style>
 </head>
 <body lang="en">
 <div>Πατάτα, Αέρας, Μάιος, άυλος, αϋπνία, Μαΐου, χούι</div>
 <div lang="el">Πατάτα, Αέρας, Μάιος, άυλος, αϋπνία, Μαΐου, χούι</div>