Bug 1008019 - Update reftest and a11y-test expectations to reflect the corrected behavior of white-space:pre-wrap. r=dholbert
authorJonathan Kew <jkew@mozilla.com>
Wed, 07 Sep 2016 00:04:28 +0100
changeset 312925 4959bbdb0d99480d556b3738a1bdfb22b371c485
parent 312924 4d1901a5332aeb47b3408d6d982f1d9788650812
child 312926 4bc68896953392f4e053ceae4eb11343b0aa973d
push id30665
push usercbook@mozilla.com
push dateWed, 07 Sep 2016 15:20:43 +0000
treeherdermozilla-central@95acb9299faf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdholbert
bugs1008019
milestone51.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 1008019 - Update reftest and a11y-test expectations to reflect the corrected behavior of white-space:pre-wrap. r=dholbert
accessible/tests/mochitest/text/test_atcaretoffset.html
layout/reftests/text/justification-1-ref.html
layout/reftests/text/justification-1.html
layout/reftests/text/reftest.list
layout/reftests/text/white-space-1-ref.html
layout/reftests/text/white-space-1a.html
layout/reftests/text/wordwrap-01-ref.html
layout/reftests/text/wordwrap-09-ref.html
--- a/accessible/tests/mochitest/text/test_atcaretoffset.html
+++ b/accessible/tests/mochitest/text/test_atcaretoffset.html
@@ -409,36 +409,28 @@
       // 10 11 12 13 14 15
 
       traverseTextByLines(gQueue, "textarea",
                           [ [ "aword", "\n", 0, 5, { words: [ 0, 5 ] } ],
                             [ "two ", "", 6, 10, { words: [ 6, 9 ] } ],
                             [ "words", "", 10, 15, { words: [ 10, 15 ] } ]
                           ] );
 
-      var line2 = [ // " my "
-        [ "TextBeforeOffset", BOUNDARY_WORD_END, kTodo, kTodo, kTodo ],
-        [ "TextAfterOffset", BOUNDARY_WORD_END, kTodo, kTodo, kTodo ]
-      ];
-      var line4 = [ // "riend"
-        [ "TextBeforeOffset", BOUNDARY_WORD_END, kTodo, kTodo, kTodo ],
-        [ "TextAfterOffset", BOUNDARY_WORD_END, kTodo, kTodo, kTodo ]
-      ];
-      var line5 = [ // " t "
+      var line4 = [ // "riend "
         [ "TextBeforeOffset", BOUNDARY_WORD_END, kTodo, kTodo, kTodo ],
         [ "TextAfterOffset", BOUNDARY_WORD_END, kTodo, kTodo, kTodo ]
       ];
       traverseTextByLines(gQueue, "ta_wrapped", 
                           [ [ "hi ", "", 0, 3, { words: [ 0, 2 ] } ],
-                            [ "hello", "", 3, 8, { words: [ 3, 8 ] } ],
-                            [ " my ", "", 8, 12, { words: [ 9, 11 ], lsf: line2 } ],
+                            [ "hello ", "", 3, 9, { words: [ 3, 8 ] } ],
+                            [ "my ", "", 9, 12, { words: [ 9, 11 ] } ],
                             [ "longf", "", 12, 17, { words: [ 12, 17 ] } ],
-                            [ "riend", "", 17, 22, { words: [ 17, 22 ], lsf: line4 } ],
-                            [ " t ", "", 22, 25, { words: [ 23, 24 ], lsf: line5 } ],
-                            [ "sq t", "", 25, 29, { words: [ 25, 27, 28, 29 ] } ]
+                            [ "riend ", "", 17, 23, { words: [ 17, 22 ], lsf: line4 } ],
+                            [ "t sq ", "", 23, 28, { words: [ 23, 24, 25, 27 ] } ],
+                            [ "t", "", 28, 29, { words: [ 28, 29 ] } ]
                           ] );
 
       gQueue.invoke(); // will call SimpleTest.finish();
     }
 
     SimpleTest.waitForExplicitFinish();
     addA11yLoadEvent(doTest);
   </script>
--- a/layout/reftests/text/justification-1-ref.html
+++ b/layout/reftests/text/justification-1-ref.html
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML>
 <html>
-<body style="line-height:1.5em; width:6em; text-align:justify; border:1px solid black; overflow:hidden;">
+<body style="font-family:monospace; line-height:1.5em; width:14ch; text-align:justify; border:1px solid black; overflow:hidden;">
 
 <p>I am the very model of a modern major-general.</p>
-<p style="width:100em;">I am the very model of a modern major-general.</p>
-<p style="width:100em;">I &nbsp;am the<br>very model of a modern major-general.</p>
+<p style="width:100ch;">I am the very model of a modern major-general.</p>
+<p style="width:100ch;">I &nbsp;am the<br>very model of a modern major-general.</p>
 <p style="text-align:left;">I&nbsp;&nbsp;&#x200b;am&nbsp;&#x200b;the<br>very&nbsp;&#x200b;model&nbsp;&#x200b;of&nbsp;&#x200b;a&nbsp;&#x200b;modern&nbsp;&#x200b;major-general.</p>
 <p>I am the<br>very model of a modern major-general.</p>
 </body>
 </html>
--- a/layout/reftests/text/justification-1.html
+++ b/layout/reftests/text/justification-1.html
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML>
 <html>
-<body style="line-height:1.5em; width:6em; text-align:justify; border:1px solid black;">
+<body style="font-family:monospace; line-height:1.5em; width:14ch; text-align:justify; border:1px solid black; overflow:hidden;">
 
 <!-- Test which white-space values are allowed to take justification -->
 
 <p style="white-space:normal;">I  am the
 very model of a modern major-general.</p>
 <p style="white-space:nowrap;">I  am the
 very model of a modern major-general.</p>
 <p style="white-space:pre;">I  am the
--- a/layout/reftests/text/reftest.list
+++ b/layout/reftests/text/reftest.list
@@ -29,17 +29,17 @@ HTTP(..) == lineheight-metrics-2a.html l
 HTTP(..) == lineheight-metrics-2b.html lineheight-metrics-2-ref.html
 == lineheight-percentage-1.html lineheight-percentage-1-ref.html
 skip-if(B2G||Mulet) == long-1.html long-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 fuzzy-if(Android,255,147) == pre-line-1.html pre-line-1-ref.html
 == pre-line-2.html pre-line-2-ref.html
 == pre-line-3.html pre-line-3-ref.html
 == pre-line-4.html pre-line-4-ref.html
 == pre-space-1.html pre-space-1-ref.html
-fails == pre-wrap-1.html pre-wrap-1-ref.html # bug 1008019
+== pre-wrap-1.html pre-wrap-1-ref.html
 == soft-hyphens-1a.html soft-hyphens-1-ref.html
 == soft-hyphens-1b.html soft-hyphens-1-ref.html
 == soft-hyphens-1c.html soft-hyphens-1-ref.html
 == soft-hyphens-break-word-1a.html soft-hyphens-break-word-1-ref.html
 == soft-hyphens-break-word-1b.html soft-hyphens-break-word-1-ref.html
 == soft-hyphens-break-word-1c.html soft-hyphens-break-word-1-ref.html
 # Tests for soft hyphens in table cells, bug 418975
 != soft-hyphen-in-table-1.html soft-hyphen-in-table-1-notref.html
--- a/layout/reftests/text/white-space-1-ref.html
+++ b/layout/reftests/text/white-space-1-ref.html
@@ -11,54 +11,54 @@ b { font-weight:normal; background-color
 </head>
 <body>
 
 <div>
 <p><b>Hello
 Kitty</b>
 <p><b>Hello Kitty</b>
 <p><b>Hello Kitty</b>
-<p><b>Hello 
+<p><b>Hello
 Kitty</b>
 </div>
 
 <div class="container">
 <p><b>Hello
 Kitty</b>
-<p><b>Hello 
+<p><b>Hello&nbsp;
 Kitty</b>
 <p><b>Hello
 Kitty</b>
-<p><b>Hello 
+<p><b>Hello
 Kitty</b>
 </div>
 
 <div class="container">
 <p><b>Hello
  Kitty</b>
 <p><b>Hello  Kitty</b>
 <p><b>Hello  Kitty</b>
-<p><b>Hello 
+<p><b>Hello
  Kitty</b>
 </div>
 
 <div class="container">
 <p><b>Hello
 Kitty</b>
 <p><b>Hello  Kitty</b>
 <p><b>Hello Kitty</b>
-<p><b>Hello 
+<p><b>Hello
 Kitty</b>
 </div>
 
 <div class="container">
-<p><b>Hello  
+<p><b>Hello&nbsp;
 Kitty</b>
-<p><b>Hello  
+<p><b>Hello&nbsp;
 Kitty</b>
-<p><b>Hello  
+<p><b>Hello&nbsp;
 Kitty</b>
-<p><b>Hello  
+<p><b>Hello
 Kitty</b>
 </div>
 
 </body>
 </html>
--- a/layout/reftests/text/white-space-1a.html
+++ b/layout/reftests/text/white-space-1a.html
@@ -41,13 +41,13 @@ b { font-weight:normal; background-color
 <p><b>Hello<span class="nowrap"> </span><span class="nowrap"> </span>Kitty</b>
 <p><b>Hello<span class="prewrap"> </span><span class="nowrap"> </span>Kitty</b>
 </div>
 
 <div class="container">
 <p><b>Hello <span class="prewrap"> </span>Kitty</b>
 <p><b>Hello<span class="pre"> </span><span class="prewrap"> </span>Kitty</b>
 <p><b>Hello<span class="nowrap"> </span><span class="prewrap"> </span>Kitty</b>
-<p><b>Hello<span class="prewrap"> </span><span class="prewrap"> </span>Kitty</b>
+<p><b>Hello<span class="prewrap">  </span>Kitty</b>
 </div>
 
 </body>
 </html>
--- a/layout/reftests/text/wordwrap-01-ref.html
+++ b/layout/reftests/text/wordwrap-01-ref.html
@@ -9,11 +9,11 @@ textarea { overflow: scroll; }
  </head>
  <body>
   <textarea rows="10" cols="20">It's
 lipsmackinthirstquen
 chinacetastinmotivat
 ingoodbuzzincooltalk
 inhighwalkinfastlivi
 nevergivincoolfizzin
- Firefox!</textarea>
+Firefox!</textarea>
  </body>
 </html>
--- a/layout/reftests/text/wordwrap-09-ref.html
+++ b/layout/reftests/text/wordwrap-09-ref.html
@@ -4,12 +4,12 @@
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
   <style type="text/css">
 textarea { overflow: scroll; word-wrap: normal; white-space: pre; }
   </style>
   <title>Test Wordwrap</title>
  </head>
  <body>
   <textarea rows="10" cols="20">It's
-lipsmackinthirstquenchinacetastinmotivatingoodbuzzincooltalkinhighwalkinfastlivinevergivincoolfizzin 
+lipsmackinthirstquenchinacetastinmotivatingoodbuzzincooltalkinhighwalkinfastlivinevergivincoolfizzin
 Firefox!</textarea>
  </body>
 </html>