Bug 661471. Part 5: Fix reftests. r=roc
authorJonathan Kew <jfkthame@gmail.com>
Fri, 03 Jun 2011 16:31:08 +1200
changeset 70483 051b1bd21ae72bad98572335fda8acc233ce2e12
parent 70482 077b3514036d716867cc04435cdd1c43a8529299
child 70484 2b7732c590bd09d98b6130f0bcddfee331e44f26
push id20337
push userrocallahan@mozilla.com
push dateFri, 03 Jun 2011 04:31:35 +0000
treeherdermozilla-central@051b1bd21ae7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc
bugs661471
milestone7.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 661471. Part 5: Fix reftests. r=roc
layout/forms/crashtests/crashtests.list
layout/reftests/bugs/reftest.list
layout/reftests/margin-collapsing/inline-block-horizontal-1-dyn.html
layout/reftests/margin-collapsing/inline-block-horizontal-1-noref.html
layout/reftests/margin-collapsing/inline-block-horizontal-1-ref.html
layout/reftests/margin-collapsing/inline-block-horizontal-1.html
layout/reftests/margin-collapsing/inline-block-horizontal-2-dyn.html
layout/reftests/margin-collapsing/inline-block-horizontal-2-noref.html
layout/reftests/margin-collapsing/inline-block-horizontal-2-ref.html
layout/reftests/margin-collapsing/inline-block-horizontal-2.html
layout/reftests/margin-collapsing/inline-horizontal-1-dyn.html
layout/reftests/margin-collapsing/inline-horizontal-1-noref.html
layout/reftests/margin-collapsing/inline-horizontal-1-ref.html
layout/reftests/margin-collapsing/inline-horizontal-1.html
layout/reftests/margin-collapsing/inline-horizontal-2-dyn.html
layout/reftests/margin-collapsing/inline-horizontal-2-noref.html
layout/reftests/margin-collapsing/inline-horizontal-2-ref.html
layout/reftests/margin-collapsing/inline-horizontal-2.html
layout/reftests/margin-collapsing/inline-table-horizontal-1-dyn.html
layout/reftests/margin-collapsing/inline-table-horizontal-1-noref.html
layout/reftests/margin-collapsing/inline-table-horizontal-1-ref.html
layout/reftests/margin-collapsing/inline-table-horizontal-1.html
layout/reftests/text/auto-hyphenation-1-notref.html
layout/reftests/text/auto-hyphenation-1-ref.html
layout/reftests/text/auto-hyphenation-1.html
layout/reftests/text/auto-hyphenation-1a.html
layout/reftests/text/auto-hyphenation-2-ref.html
layout/reftests/text/auto-hyphenation-2.html
layout/reftests/text/reftest.list
--- a/layout/forms/crashtests/crashtests.list
+++ b/layout/forms/crashtests/crashtests.list
@@ -38,11 +38,11 @@ load 455451-1.html
 load 457537-1.html
 load 457537-2.html
 load 478219-1.xhtml
 load 513113-1.html
 load 538062-1.xhtml
 load 570624-1.html
 load 498698-1.html
 asserts(1) load 578604-1.html # bug 584564
-asserts(5) load 590302-1.xhtml # bug 584564
+asserts(3-5) load 590302-1.xhtml # bug 584564
 load 626014.xhtml
 load 639733.xhtml
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -670,17 +670,17 @@ fails-if(Android) != 376532-3.html 37653
 == 378535-1.html 378535-1-ref.html
 == 378933-1.html 378933-1-ref.html
 == 378935-1.html 378935-1-ref.html
 == 378937-1.html 378937-1-ref.html
 == 379178-xhtml.xhtml 379178-xhtml-ref.xhtml
 == 379178-html.html 379178-html-ref.html
 == 379178-svg.svg 379178-svg-ref.svg
 == 379316-1.html 379316-1-ref.html
-fails-if(Android) random-if(cocoaWidget) fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 379316-2.html 379316-2-ref.html # bug 379786
+fails-if(Android) random-if(cocoaWidget) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 379316-2.html 379316-2-ref.html # bug 379786
 == 379328-1.html 379328-1-ref.html
 == 379349-1a.xhtml 379349-1-ref.xhtml
 == 379349-1b.xhtml 379349-1-ref.xhtml
 == 379349-1c.xhtml 379349-1-ref.xhtml
 == 379349-2a.xhtml 379349-2-ref.xhtml
 == 379349-2b.xhtml 379349-2-ref.xhtml
 == 379349-3a.xhtml 379349-3-ref.xhtml
 == 379349-3b.xhtml 379349-3-ref.xhtml
@@ -1533,17 +1533,18 @@ needs-focus == 568441.html 568441-ref.ht
 == 571347-2c.html 571347-2-ref.html
 == 571347-2d.html 571347-2-ref.html
 == 571347-3.html 571347-3-ref.html
 == 572598-1.html 572598-ref.html
 == 574898-1.html 574898-ref.html
 # 574907 is a windows-only issue, result on other platforms depends on details of font support
 random-if(!winWidget) == 574907-1.html 574907-1-ref.html
 random-if(!winWidget) == 574907-2.html 574907-2-ref.html
-random-if(!winWidget) fails-if(winWidget&&!d2d) != 574907-3.html 574907-3-notref.html
+# 574907-3 only worked under directwrite, and even there it now depends on the rendering mode; marking as random for now
+random-if(!winWidget) fails-if(winWidget&&!d2d) random-if(winWidget&&d2d) != 574907-3.html 574907-3-notref.html
 == 577838-1.html 577838-1-ref.html
 == 577838-2.html 577838-2-ref.html
 fails-if(Android) random-if(layersGPUAccelerated) fails-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) fails-if(/Mac\x20OS\x20X\x2010\.5/.test(http.oscpu)) == 579323-1.html 579323-1-ref.html # bug 623450 for WinXP and bug 627560 for OSX 10.5
 == 579349-1.html 579349-1-ref.html
 == 579655-1.html 579655-1-ref.html
 fails-if(Android) == 579808-1.html 579808-1-ref.html
 fails-if(Android) random-if(layersGPUAccelerated) fails-if(/^Windows\x20NT\x205\.1/.test(http.oscpu))  == 579985-1.html 579985-1-ref.html # bug 623452 for WinXP; this bug was only for a regression in BasicLayers anyway
 == 580160-1.html 580160-1-ref.html
--- a/layout/reftests/margin-collapsing/inline-block-horizontal-1-dyn.html
+++ b/layout/reftests/margin-collapsing/inline-block-horizontal-1-dyn.html
@@ -1,12 +1,15 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
 <head>
 <style type="text/css">
+body {
+ font-family: sans-serif;
+}
 #ib1 {
  display: inline-block;
  margin-right: 20px;
 }
 #ib2 {
  display: none;
  margin-left: 10px;
 }
--- a/layout/reftests/margin-collapsing/inline-block-horizontal-1-noref.html
+++ b/layout/reftests/margin-collapsing/inline-block-horizontal-1-noref.html
@@ -1,12 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style type="text/css">
+body {
+ font-family: sans-serif;
+}
 span {
  display: inline-block;
 }
 #ib1 {
  margin-right: 20px;
 }
 </style>
 </head>
--- a/layout/reftests/margin-collapsing/inline-block-horizontal-1-ref.html
+++ b/layout/reftests/margin-collapsing/inline-block-horizontal-1-ref.html
@@ -1,12 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style type="text/css">
+body {
+ font-family: sans-serif;
+}
 span {
  display: inline-block;
 }
 #ib1 {
  margin-right: 30px;
 }
 </style>
 </head>
--- a/layout/reftests/margin-collapsing/inline-block-horizontal-1.html
+++ b/layout/reftests/margin-collapsing/inline-block-horizontal-1.html
@@ -1,12 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style type="text/css">
+body {
+ font-family: sans-serif;
+}
 #ib1 {
  display: inline-block;
  margin-right: 20px;
 }
 #ib2 {
  display: inline-block;
  margin-left: 10px;
 }
--- a/layout/reftests/margin-collapsing/inline-block-horizontal-2-dyn.html
+++ b/layout/reftests/margin-collapsing/inline-block-horizontal-2-dyn.html
@@ -1,12 +1,15 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
 <head>
 <style type="text/css">
+body {
+ font-family: sans-serif;
+}
 #ib1 {
  display: inline-block;
  margin-right: 10px;
 }
 #ib2 {
  display: none;
  margin-left: 10px;
  margin-right: 20px;
--- a/layout/reftests/margin-collapsing/inline-block-horizontal-2-noref.html
+++ b/layout/reftests/margin-collapsing/inline-block-horizontal-2-noref.html
@@ -1,12 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style type="text/css">
+body {
+ font-family: sans-serif;
+}
 span {
  display: inline-block;
 }
 #ib2 {
  margin-left: 10px;
  margin-right: 40px;
 }
 </style>
--- a/layout/reftests/margin-collapsing/inline-block-horizontal-2-ref.html
+++ b/layout/reftests/margin-collapsing/inline-block-horizontal-2-ref.html
@@ -1,12 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style type="text/css">
+body {
+ font-family: sans-serif;
+}
 span {
  display: inline-block;
 }
 #ib2 {
  margin-left: 10px;
  margin-right: 70px;
 }
 </style>
--- a/layout/reftests/margin-collapsing/inline-block-horizontal-2.html
+++ b/layout/reftests/margin-collapsing/inline-block-horizontal-2.html
@@ -1,12 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style type="text/css">
+body {
+ font-family: sans-serif;
+}
 #ib1 {
  display: inline-block;
  margin-right: 10px;
 }
 #ib2 {
  display: inline-block;
  margin-left: 10px;
  margin-right: 20px;
--- a/layout/reftests/margin-collapsing/inline-horizontal-1-dyn.html
+++ b/layout/reftests/margin-collapsing/inline-horizontal-1-dyn.html
@@ -1,12 +1,15 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
 <head>
 <style type="text/css">
+body {
+ font-family: sans-serif;
+}
 #inline1 {
  margin-right: 10px;
 }
 #inline2 {
  display: none;
  margin-left: 20px;
 }
 </style>
--- a/layout/reftests/margin-collapsing/inline-horizontal-1-noref.html
+++ b/layout/reftests/margin-collapsing/inline-horizontal-1-noref.html
@@ -1,12 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style type="text/css">
+body {
+ font-family: sans-serif;
+}
 #inline1 {
  margin-right: 20px;
 }
 </style>
 </head>
 <body>
 <div><span id="inline1">Hello</span><span>Kitty</span></div>
 </body>
--- a/layout/reftests/margin-collapsing/inline-horizontal-1-ref.html
+++ b/layout/reftests/margin-collapsing/inline-horizontal-1-ref.html
@@ -1,12 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style type="text/css">
+body {
+ font-family: sans-serif;
+}
 #inline1 {
  margin-right: 30px;
 }
 </style>
 </head>
 <body>
 <div><span id="inline1">Hello</span><span>Kitty</span></div>
 </body>
--- a/layout/reftests/margin-collapsing/inline-horizontal-1.html
+++ b/layout/reftests/margin-collapsing/inline-horizontal-1.html
@@ -1,12 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style type="text/css">
+body {
+ font-family: sans-serif;
+}
 #inline1 {
  margin-right: 10px;
 }
 #inline2 {
  margin-left: 20px;
 }
 </style>
 </head>
--- a/layout/reftests/margin-collapsing/inline-horizontal-2-dyn.html
+++ b/layout/reftests/margin-collapsing/inline-horizontal-2-dyn.html
@@ -1,12 +1,15 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
 <head>
 <style type="text/css">
+body {
+ font-family: sans-serif;
+}
 #inline1 {
  margin-right: 10px;
 }
 #inline2 {
  display: none;
  margin-left: 10px;
  margin-right: 20px;
 }
--- a/layout/reftests/margin-collapsing/inline-horizontal-2-noref.html
+++ b/layout/reftests/margin-collapsing/inline-horizontal-2-noref.html
@@ -1,12 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style type="text/css">
+body {
+ font-family: sans-serif;
+}
 #inline2 {
  margin-left: 10px;
  margin-right: 40px;
 }
 </style>
 </head>
 <body>
 <div><span id="inline1">Hello<span id="inline2">my</span></span><span id="inline3">Kitty</span></div>
--- a/layout/reftests/margin-collapsing/inline-horizontal-2-ref.html
+++ b/layout/reftests/margin-collapsing/inline-horizontal-2-ref.html
@@ -1,12 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style type="text/css">
+body {
+ font-family: sans-serif;
+}
 #inline2 {
  margin-left: 10px;
  margin-right: 70px;
 }
 </style>
 </head>
 <body>
 <div><span id="inline1">Hello<span id="inline2">my</span></span><span id="inline3">Kitty</span></div>
--- a/layout/reftests/margin-collapsing/inline-horizontal-2.html
+++ b/layout/reftests/margin-collapsing/inline-horizontal-2.html
@@ -1,12 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style type="text/css">
+body {
+ font-family: sans-serif;
+}
 #inline1 {
  margin-right: 10px;
 }
 #inline2 {
  margin-left: 10px;
  margin-right: 20px;
 }
 #inline3 {
--- a/layout/reftests/margin-collapsing/inline-table-horizontal-1-dyn.html
+++ b/layout/reftests/margin-collapsing/inline-table-horizontal-1-dyn.html
@@ -1,12 +1,15 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
 <head>
 <style type="text/css">
+body {
+ font-family: sans-serif;
+}
 #it1 {
  display: inline-table;
  margin-right: 20px;
 }
 #it2 {
  display: none;
  margin-left: 10px;
 }
--- a/layout/reftests/margin-collapsing/inline-table-horizontal-1-noref.html
+++ b/layout/reftests/margin-collapsing/inline-table-horizontal-1-noref.html
@@ -1,12 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style type="text/css">
+body {
+ font-family: sans-serif;
+}
 #it1 {
  display: inline-table;
  margin-right: 20px;
 }
 #it2 {
  display: inline-table;
 }
 </style>
--- a/layout/reftests/margin-collapsing/inline-table-horizontal-1-ref.html
+++ b/layout/reftests/margin-collapsing/inline-table-horizontal-1-ref.html
@@ -1,12 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style type="text/css">
+body {
+ font-family: sans-serif;
+}
 #it1 {
  display: inline-table;
  margin-right: 30px;
 }
 #it2 {
  display: inline-table;
 }
 </style>
--- a/layout/reftests/margin-collapsing/inline-table-horizontal-1.html
+++ b/layout/reftests/margin-collapsing/inline-table-horizontal-1.html
@@ -1,12 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style type="text/css">
+body {
+ font-family: sans-serif;
+}
 #it1 {
  display: inline-table;
  margin-right: 20px;
 }
 #it2 {
  display: inline-table;
  margin-left: 10px;
 }
--- a/layout/reftests/text/auto-hyphenation-1-notref.html
+++ b/layout/reftests/text/auto-hyphenation-1-notref.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html>
 <body lang="en-us">
-<div style="width: 5em;">
+<div style="width: 5em; font-family:sans-serif;">
 supercalifragilisticexpialidocious
 </div>
 </body>
 </html>
 
--- a/layout/reftests/text/auto-hyphenation-1-ref.html
+++ b/layout/reftests/text/auto-hyphenation-1-ref.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html>
 <body lang="en-us">
-<div style="width: 5em; -moz-hyphens: manual;">
+<div style="width: 5em; -moz-hyphens: manual; font-family:sans-serif;">
 su&shy;per&shy;cal&shy;ifrag&shy;ilis&shy;tic&shy;ex&shy;pi&shy;ali&shy;do&shy;cious
 </div>
 </body>
 </html>
 
--- a/layout/reftests/text/auto-hyphenation-1.html
+++ b/layout/reftests/text/auto-hyphenation-1.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
 <!-- simple test for automatic hyphenation -->
 <body lang="en-us">
-<div style="width: 5em; -moz-hyphens: auto;">
+<div style="width: 5em; -moz-hyphens: auto; font-family:sans-serif;">
 supercalifragilisticexpialidocious
 </div>
 </body>
 </html>
 
--- a/layout/reftests/text/auto-hyphenation-1a.html
+++ b/layout/reftests/text/auto-hyphenation-1a.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
 <!-- adding random <span>s should not affect hyphenation -->
 <body lang="en-us">
-<div style="width: 5em; -moz-hyphens: auto;">
+<div style="width: 5em; -moz-hyphens: auto; font-family:sans-serif;">
 super<span>cali</span>frag<span>ili</span>sti<span>cex</span>pialidoc<span>i</span>ous
 </div>
 </body>
 </html>
 
--- a/layout/reftests/text/auto-hyphenation-2-ref.html
+++ b/layout/reftests/text/auto-hyphenation-2-ref.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
 <body lang="en-us">
-<div style="width: 5em; -moz-hyphens: auto;">
+<div style="width: 5em; -moz-hyphens: auto; font-family:sans-serif;">
 supercalifragilisticexpialidocious
 <span style="-moz-hyphens:none">supercalifragilisticexpialidocious</span>
 supercalifragilisticexpialidocious
 </div>
 </body>
 </html>
 
--- a/layout/reftests/text/auto-hyphenation-2.html
+++ b/layout/reftests/text/auto-hyphenation-2.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html>
 <!-- mixed languages in a word should inhibit automatic hyphenation -->
 <body lang="en-us">
-<div style="width: 5em; -moz-hyphens: auto;">
+<div style="width: 5em; -moz-hyphens: auto; font-family:sans-serif;">
 supercalifragilisticexpialidocious
 super<span lang="foo">cali</span>fragilisticexpialidocious
 supercalifragilisticexpialidocious
 </div>
 </body>
 </html>
 
--- a/layout/reftests/text/reftest.list
+++ b/layout/reftests/text/reftest.list
@@ -37,17 +37,18 @@ fails-if(cocoaWidget||winWidget) HTTP(..
 # Cairo's FreeType and GDI backends snap glyphs to pixels, while Mac (usually)
 # and D2D have subpixel positioning.  The tests for pixel-snapping assume that
 # 1 CSS pixel == 1 device pixel
 fails-if(Android) skip-if(d2d||cocoaWidget) == subpixel-glyphs-x-1a.html subpixel-glyphs-x-1b.html
 # Platforms with subpixel positioning already have inconsistent glyphs by
 # design, but that is considered more tolerable because they are subpixel
 # inconsistencies.  On those platforms we just test that glyph positions are
 # subpixel.
-skip-if(!(d2d||cocoaWidget)) != subpixel-glyphs-x-2a.html subpixel-glyphs-x-2b.html
+# D2D/DirectWrite results depend on the rendering mode chosen, so considering this as random for now.
+skip-if(!(d2d||cocoaWidget)) random-if(d2d) != subpixel-glyphs-x-2a.html subpixel-glyphs-x-2b.html
 # No platforms do subpixel positioning vertically
 == subpixel-glyphs-y-1a.html subpixel-glyphs-y-1b.html
 == subpixel-lineheight-1a.html subpixel-lineheight-1b.html
 == swash-1.html swash-1-ref.html
 fails-if(Android) HTTP(..) != synthetic-bold-metrics-01.html synthetic-bold-metrics-01-notref.html
 == variation-selector-unsupported-1.html variation-selector-unsupported-1-ref.html
 == white-space-1a.html white-space-1-ref.html
 == white-space-1b.html white-space-1-ref.html