Title: [95795] trunk/LayoutTests
Revision
95795
Author
[email protected]
Date
2011-09-23 05:43:31 -0700 (Fri, 23 Sep 2011)

Log Message

[chromium] Rebaseline following r95745, r95725
https://bugs.webkit.org/show_bug.cgi?id=68685

Unreviewed rebaseline.

* platform/chromium-cg-mac-leopard/editing/deleting/merge-whitespace-pre-expected.png:
* platform/chromium-linux/editing/deleting/merge-whitespace-pre-expected.png:
* platform/chromium-mac/editing/deleting/merge-whitespace-pre-expected.png:
* platform/chromium-win/editing/deleting/merge-whitespace-pre-expected.png:
* platform/chromium-win/editing/deleting/merge-whitespace-pre-expected.txt:
* platform/chromium/test_expectations.txt:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (95794 => 95795)


--- trunk/LayoutTests/ChangeLog	2011-09-23 12:06:15 UTC (rev 95794)
+++ trunk/LayoutTests/ChangeLog	2011-09-23 12:43:31 UTC (rev 95795)
@@ -1,3 +1,17 @@
+2011-09-23  Marcus Bulach  <[email protected]>
+
+        [chromium] Rebaseline following r95745, r95725
+        https://bugs.webkit.org/show_bug.cgi?id=68685
+
+        Unreviewed rebaseline.
+
+        * platform/chromium-cg-mac-leopard/editing/deleting/merge-whitespace-pre-expected.png:
+        * platform/chromium-linux/editing/deleting/merge-whitespace-pre-expected.png:
+        * platform/chromium-mac/editing/deleting/merge-whitespace-pre-expected.png:
+        * platform/chromium-win/editing/deleting/merge-whitespace-pre-expected.png:
+        * platform/chromium-win/editing/deleting/merge-whitespace-pre-expected.txt:
+        * platform/chromium/test_expectations.txt:
+
 2011-09-22  Ilya Tikhonovsky  <[email protected]>
 
         Web Inspector: UI performance test for Scripts panel first open experience.

Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (95794 => 95795)


--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-09-23 12:06:15 UTC (rev 95794)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-09-23 12:43:31 UTC (rev 95795)
@@ -3314,7 +3314,7 @@
 // After r87526, these all have extra scrollbars where the platform/mac expectations do not.
 BUGWK61664 LINUX : svg/zoom/page/relative-sized-document-scrollbars.svg = IMAGE
 
-BUGCR84317 DEBUG : svg/wicd/test-scalable-background-image1.xhtml = CRASH
+BUGCR84317 : svg/wicd/test-scalable-background-image1.xhtml = CRASH IMAGE
 
 BUGWK61767 WIN DEBUG : http/tests/websocket/tests/hixie76/client-close.html = PASS TEXT
 BUGWK61767 WIN DEBUG : http/tests/websocket/tests/hybi/client-close.html = PASS TEXT
@@ -3783,3 +3783,5 @@
 BUG_EPOGER MAC CPU : fast/dom/HTMLMeterElement/meter-element-repaint-on-update-value.html = IMAGE
 
 BUGWK68674 : fast/js/function-bind.html = TEXT
+
+BUGWK68693 LEOPARD : editing/deleting/merge-whitespace-pre.html = IMAGE PASS

Modified: trunk/LayoutTests/platform/chromium-cg-mac-leopard/editing/deleting/merge-whitespace-pre-expected.png


(Binary files differ)

Modified: trunk/LayoutTests/platform/chromium-linux/editing/deleting/merge-whitespace-pre-expected.png


(Binary files differ)

Modified: trunk/LayoutTests/platform/chromium-mac/editing/deleting/merge-whitespace-pre-expected.png


(Binary files differ)

Modified: trunk/LayoutTests/platform/chromium-win/editing/deleting/merge-whitespace-pre-expected.png


(Binary files differ)

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


--- trunk/LayoutTests/platform/chromium-win/editing/deleting/merge-whitespace-pre-expected.txt	2011-09-23 12:06:15 UTC (rev 95794)
+++ trunk/LayoutTests/platform/chromium-win/editing/deleting/merge-whitespace-pre-expected.txt	2011-09-23 12:43:31 UTC (rev 95795)
@@ -12,8 +12,9 @@
         RenderBlock {DIV} at (0,0) size 784x20
           RenderText {#text} at (0,0) size 20x19
             text run at (0,0) width 20: "foo"
-          RenderText {#text} at (20,0) size 20x19
-            text run at (20,0) width 20: "bar"
+          RenderInline {SPAN} at (0,0) size 24x16
+            RenderText {#text} at (20,3) size 24x16
+              text run at (20,3) width 24: "bar"
         RenderBlock {PRE} at (0,33) size 784x16
           RenderText {#text} at (0,0) size 24x16
             text run at (0,0) width 24: "baz"
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to