Title: [95342] trunk/LayoutTests
Revision
95342
Author
rn...@webkit.org
Date
2011-09-16 17:44:34 -0700 (Fri, 16 Sep 2011)

Log Message

Fix the rebaseline in r95325 and also rebaseline for r95335.

* inspector/styles/styles-update-from-js-expected.txt:
* platform/chromium/test_expectations.txt
* platform/chromium-win/editing/deleting/merge-whitespace-pre-expected.txt:
* platform/qt/editing/deleting/merge-whitespace-pre-expected.txt:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (95341 => 95342)


--- trunk/LayoutTests/ChangeLog	2011-09-17 00:33:09 UTC (rev 95341)
+++ trunk/LayoutTests/ChangeLog	2011-09-17 00:44:34 UTC (rev 95342)
@@ -1,3 +1,12 @@
+2011-09-16  Ryosuke Niwa  <rn...@webkit.org>
+
+        Fix the rebaseline in r95325 and also rebaseline for r95335.
+
+        * inspector/styles/styles-update-from-js-expected.txt:
+        * platform/chromium/test_expectations.txt
+        * platform/chromium-win/editing/deleting/merge-whitespace-pre-expected.txt:
+        * platform/qt/editing/deleting/merge-whitespace-pre-expected.txt:
+
 2011-09-16  Gavin Barraclough  <barraclo...@apple.com>
 
         Unsigned bit shift fails under certain conditions in 32 bit builds

Modified: trunk/LayoutTests/inspector/styles/styles-update-from-js-expected.txt (95341 => 95342)


--- trunk/LayoutTests/inspector/styles/styles-update-from-js-expected.txt	2011-09-17 00:33:09 UTC (rev 95341)
+++ trunk/LayoutTests/inspector/styles/styles-update-from-js-expected.txt	2011-09-17 00:44:34 UTC (rev 95342)
@@ -52,3 +52,4 @@
     border-left-width: 3px;
 
 
+

Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (95341 => 95342)


--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-09-17 00:33:09 UTC (rev 95341)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-09-17 00:44:34 UTC (rev 95342)
@@ -3747,6 +3747,3 @@
 
 // Crashes or timeouts once in a while but never fails
 BUG_KEISHI LINUX : media/video-controls-visible-audio-only.html = PASS TIMEOUT CRASH
-
-// Needs rebaseline
-BUGRNIWA : editing/deleting/merge-whitespace-pre-expected = PASS FAIL

Modified: trunk/LayoutTests/platform/chromium-win/editing/deleting/merge-whitespace-pre-expected.txt (95341 => 95342)


--- trunk/LayoutTests/platform/chromium-win/editing/deleting/merge-whitespace-pre-expected.txt	2011-09-17 00:33:09 UTC (rev 95341)
+++ trunk/LayoutTests/platform/chromium-win/editing/deleting/merge-whitespace-pre-expected.txt	2011-09-17 00:44:34 UTC (rev 95342)
@@ -12,9 +12,8 @@
         RenderBlock {DIV} at (0,0) size 784x20
           RenderText {#text} at (0,0) size 20x19
             text run at (0,0) width 20: "foo"
-          RenderInline {SPAN} at (0,0) size 24x16
-            RenderText {#text} at (20,3) size 24x16
-              text run at (20,3) width 24: "bar"
+          RenderText {#text} at (20,0) size 20x19
+            text run at (20,0) width 20: "bar"
         RenderBlock {PRE} at (0,33) size 784x16
           RenderText {#text} at (0,0) size 24x16
             text run at (0,0) width 24: "baz"

Modified: trunk/LayoutTests/platform/qt/editing/deleting/merge-whitespace-pre-expected.txt (95341 => 95342)


--- trunk/LayoutTests/platform/qt/editing/deleting/merge-whitespace-pre-expected.txt	2011-09-17 00:33:09 UTC (rev 95341)
+++ trunk/LayoutTests/platform/qt/editing/deleting/merge-whitespace-pre-expected.txt	2011-09-17 00:44:34 UTC (rev 95342)
@@ -12,9 +12,8 @@
         RenderBlock {DIV} at (0,0) size 784x22
           RenderText {#text} at (0,0) size 21x22
             text run at (0,0) width 21: "foo"
-          RenderInline {SPAN} at (0,0) size 18x17
-            RenderText {#text} at (21,3) size 18x17
-              text run at (21,3) width 18: "bar"
+          RenderText {#text} at (21,0) size 24x22
+            text run at (21,0) width 24: "bar"
         RenderBlock {PRE} at (0,35) size 784x17
           RenderText {#text} at (0,0) size 21x17
             text run at (0,0) width 21: "baz"
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to