bug 616281 - fix the wordwrap-02 reftest to be independent of platform fonts. r=roc a=test-only
authorJonathan Kew <jfkthame@gmail.com>
Mon, 06 Dec 2010 10:49:50 +0000
changeset 58653 64c753b5e23fc48898960fc5ad652167ae81568b
parent 58652 1788c427e7f17106b871b215c22cff234dfa80b2
child 58654 a722e6bdd0037fa89274e9ffd05a42d8c5b109dc
push id17395
push userjkew@mozilla.com
push dateMon, 06 Dec 2010 10:53:52 +0000
treeherdermozilla-central@a722e6bdd003 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc, test-only
bugs616281
milestone2.0b8pre
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 616281 - fix the wordwrap-02 reftest to be independent of platform fonts. r=roc a=test-only
layout/reftests/text/reftest.list
layout/reftests/text/wordwrap-02-ref.html
layout/reftests/text/wordwrap-02.html
--- a/layout/reftests/text/reftest.list
+++ b/layout/reftests/text/reftest.list
@@ -43,18 +43,17 @@ skip-if(!(d2d||cocoaWidget)) != subpixel
 == swash-1.html swash-1-ref.html
 # Test for bug 593564, synthetic bold should cause glyph metrics to increase
 # Random on Windows - fails on tinderbox Opt reftest, passes elsewhere - see bug 597300
 random-if(winWidget) HTTP(..) != synthetic-bold-metrics-01.html synthetic-bold-metrics-01-notref.html
 == white-space-1a.html white-space-1-ref.html
 == white-space-1b.html white-space-1-ref.html
 == white-space-2.html white-space-2-ref.html
 == wordwrap-01.html wordwrap-01-ref.html
-# bad fonts on test boxes: Mac is not monospace, WINNT 5.2 combines some characters into a single cell.
-fails-if(!(gtk2Widget||d2d)) == wordwrap-02.html wordwrap-02-ref.html
+HTTP(..) == wordwrap-02.html wordwrap-02-ref.html
 HTTP(..) == wordwrap-03.html wordwrap-03-ref.html
 == wordwrap-04.html wordwrap-04-ref.html
 == wordwrap-05.html wordwrap-05-ref.html
 == wordwrap-06.html wordwrap-06-ref.html
 == wordwrap-07.html wordwrap-07-ref.html
 != wordwrap-08.html wordwrap-01-ref.html
 == wordwrap-08.html wordwrap-08-ref.html
 != wordwrap-09.html wordwrap-01-ref.html
--- a/layout/reftests/text/wordwrap-02-ref.html
+++ b/layout/reftests/text/wordwrap-02-ref.html
@@ -1,22 +1,30 @@
 <!DOCTYPE html>
 <!-- tests that Arabic characters shape across word breaks -->
 <html>
  <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
   <style type="text/css">
-textarea { overflow: scroll; }
+@font-face {
+  font-family: dvm;
+  src: url(../fonts/DejaVuSansMono.woff);
+}
+textarea {
+  font-family: dvm;
+  line-height: 1.5em;
+  overflow: scroll;
+}
   </style>
   <title>Test Wordwrap</title>
  </head>
  <body>
-  <textarea rows="10" cols="20" dir="rtl">ذهعقروبلجيكا،الموسوع&zwj;
-&zwj;ةكل,تمبوابةاقتصاديةه&zwj;
-&zwj;ذه.ضمنهاالروسوحرمانب&zwj;
-&zwj;لعدد,يكنجسيمةلإعادةلم
-&zwj;.يكنوالحلفاءبالقنابل&zwj;
-&zwj;هو,بحثخسائرالدفاعبال&zwj;
-&zwj;هجومعن.فرنسيةمارشالب&zwj;
-&zwj;ينيتودحرثم,وصلبشريةا
+  <textarea rows="10" cols="20" dir="rtl">ذهعقروبلجيكا،الموسوﻋ
+ﺔكل,تمبوابةاقتصاديةﻫ
+ﺬه.ضمنهاالروسوحرماﻧﺒ
+ﻠﻌﺪد,يكنجسيمةلإعادةلم
+.يكنوالحلفاءبالقناﺑﻠ
+ﻬﻮ,بحثخسائرالدفاعباﻟ
+ﻬﺠﻮمعن.فرنسيةمارشاﻟﺒ
+ﻴﻨﻴﺘﻮدحرثم,وصلبشريةا
 لرايخبالحربتم.</textarea>
  </body>
 </html>
--- a/layout/reftests/text/wordwrap-02.html
+++ b/layout/reftests/text/wordwrap-02.html
@@ -1,14 +1,22 @@
 <!DOCTYPE html>
 <!-- tests that Arabic characters shape across word breaks -->
 <html>
  <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
   <style type="text/css">
-textarea { overflow: scroll; }
+@font-face {
+  font-family: dvm;
+  src: url(../fonts/DejaVuSansMono.woff);
+}
+textarea {
+  font-family: dvm;
+  line-height: 1.5em;
+  overflow: scroll;
+}
   </style>
   <title>Test Wordwrap</title>
  </head>
  <body>
   <textarea rows="10" cols="20" dir="rtl">ذهعقروبلجيكا،الموسوعةكل,تمبوابةاقتصاديةهذه.ضمنهاالروسوحرمانبلعدد,يكنجسيمةلإعادةلم.يكنوالحلفاءبالقنابلهو,بحثخسائرالدفاعبالهجومعن.فرنسيةمارشالبينيتودحرثم,وصلبشريةالرايخبالحربتم.</textarea>
  </body>
 </html>