Rebaseline tests corresponding to http://trac.webkit.org/changeset/43243

TBR=dglazkov

Review URL: http://codereview.chromium.org/113084

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15515 0039d316-1c4b-4281-b951-d872f2087c98

14 files changed, 41 insertions, 53 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-011-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-011-expected.txt
index b3a6a35..7568fbf 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-011-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-011-expected.txt
@@ -16,10 +16,9 @@ layer at (0,0) size 800x600
         RenderText {#text} at (0,0) size 28x19
           text run at (0,0) width 28: "hello"
       RenderBlock {DIV} at (0,20) size 784x56 [border: (2px solid #FF0000)]
-        RenderInline {FONT} at (0,0) size 0x20
-          RenderInline {SPAN} at (0,0) size 0x19
-            RenderInline {FONT} at (0,0) size 0x27
-              RenderInline {SPAN} at (0,0) size 0x27
-                RenderBR {BR} at (14,14) size 0x27
+        RenderInline {SPAN} at (0,0) size 0x19
+          RenderInline {FONT} at (0,0) size 0x27
+            RenderInline {SPAN} at (0,0) size 0x27
+              RenderBR {BR} at (14,14) size 0x27
       RenderBlock (anonymous) at (0,76) size 784x0
-caret: position 0 of child 0 {BR} of child 0 {SPAN} of child 0 {FONT} of child 0 {SPAN} of child 0 {FONT} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+caret: position 0 of child 0 {BR} of child 0 {SPAN} of child 0 {FONT} of child 0 {SPAN} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-select-all-001-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-select-all-001-expected.txt
index 7c8cfe4..24e3b43 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-select-all-001-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-select-all-001-expected.txt
@@ -15,7 +15,6 @@ layer at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
       RenderBlock {DIV} at (0,0) size 784x48 [border: (2px solid #FF0000)]
         RenderBlock (anonymous) at (14,14) size 756x20
-          RenderInline {FONT} at (0,0) size 0x19
-            RenderInline {SPAN} at (0,0) size 0x19
-              RenderBR {BR} at (0,0) size 0x19
-caret: position 0 of child 0 {BR} of child 0 {SPAN} of child 0 {FONT} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+          RenderInline {SPAN} at (0,0) size 0x19
+            RenderBR {BR} at (0,0) size 0x19
+caret: position 0 of child 0 {BR} of child 0 {SPAN} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/19089-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/19089-expected.txt
index 734ab86..7d5422b 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/19089-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/19089-expected.txt
@@ -1,2 +1,2 @@
 This tests to make sure an ASSERT doesn't fire when performing a FormatBlock operation on a selection that ends just after a horizontal rule that is the last element in the document. The test should not assert.
-<pre><span class="Apple-style-span" style="font-family: 'times new roman'; font-size: 16px; white-space: normal; "><hr></span></pre>
+<pre><span class="Apple-style-span" style="font-family: 'times new roman'; white-space: normal; "><hr></span></pre>
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/remove-formatting-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/remove-formatting-2-expected.txt
index d69bc5d..70e72fb 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/remove-formatting-2-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/remove-formatting-2-expected.txt
@@ -16,7 +16,9 @@ layer at (0,0) size 800x600
           text run at (0,0) width 755: "This tests that RemoveFormat not only removes style from the selected part of the DOM, but that it also applies the document"
           text run at (0,20) width 534: "default style to the selection if that's necessary in order to leave the selected text unstyled."
       RenderBlock {DIV} at (0,56) size 784x20
-        RenderText {#text} at (0,0) size 292x19
-          text run at (0,0) width 292: "This text should look the same as the text above."
+        RenderText {#text} at (0,0) size 25x19
+          text run at (0,0) width 25: "This"
+        RenderText {#text} at (25,0) size 267x19
+          text run at (25,0) width 267: " text should look the same as the text above."
 selection start: position 0 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
 selection end:   position 4 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5027857-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5027857-expected.checksum
index 3500796..fa572ee 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5027857-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5027857-expected.checksum
@@ -1 +1 @@
-197e74a99c8aee1c61156fea9b04c7c1
\ No newline at end of file
+e17aa21687ac99f30326bb6c32c2571a
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5027857-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5027857-expected.png
index 3098d67..fae2222 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5027857-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5027857-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5027857-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5027857-expected.txt
index 86a2df1..84f7023 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5027857-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5027857-expected.txt
@@ -2,20 +2,20 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x576
+    RenderBody {BODY} at (8,8) size 784x579
       RenderBlock {P} at (0,0) size 784x40
         RenderText {#text} at (0,0) size 781x39
           text run at (0,0) width 393: "This tests a bug when copying HTML markup inside <pre> tags. "
           text run at (393,0) width 388: "When pasted, this content would appear as the rendered form of"
           text run at (0,20) width 80: "that markup. "
           text run at (80,20) width 316: "You should see markup in the editable region below."
-      RenderBlock {PRE} at (0,56) size 784x18
+      RenderBlock {PRE} at (0,56) size 784x16
         RenderBlock (anonymous) at (0,0) size 784x0
           RenderInline {SPAN} at (0,0) size 0x0
-        RenderBlock (anonymous) at (0,0) size 784x18
-          RenderBlock {PRE} at (0,0) size 784x18
-            RenderText {#text} at (0,0) size 410x18
-              text run at (0,0) width 410: "<input type='button'>foo<br>bar<b>baz</b>"
-        RenderBlock (anonymous) at (0,34) size 784x0
+        RenderBlock (anonymous) at (0,0) size 784x16
+          RenderBlock {PRE} at (0,0) size 784x16
+            RenderText {#text} at (0,0) size 328x16
+              text run at (0,0) width 328: "<input type='button'>foo<br>bar<b>baz</b>"
+        RenderBlock (anonymous) at (0,29) size 784x0
           RenderInline {SPAN} at (0,0) size 0x0
 caret: position 41 of child 0 {#text} of child 0 {PRE} of child 0 {SPAN} of child 2 {PRE} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-pre-002-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-pre-002-expected.checksum
index 76e8271..6797183 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-pre-002-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-pre-002-expected.checksum
@@ -1 +1 @@
-76a509d97ea2b17a217cf186f6ba0ff0
\ No newline at end of file
+648d338abdaf5e186883ec2d1b62e7e0
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-pre-002-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-pre-002-expected.png
index 6a47f94..a6e1d18 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-pre-002-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-pre-002-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-pre-002-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-pre-002-expected.txt
index f671641..f285c29 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-pre-002-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-pre-002-expected.txt
@@ -12,7 +12,7 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x576
+    RenderBody {BODY} at (8,8) size 784x579
       RenderBlock {DIV} at (0,0) size 784x40
         RenderText {#text} at (0,0) size 139x19
           text run at (0,0) width 139: "This is a layout test for "
@@ -24,17 +24,17 @@ layer at (0,0) size 800x600
           text run at (657,0) width 103: "The text below is"
           text run at (0,20) width 242: "selected, copied, and pasted over itself. "
           text run at (242,20) width 193: "You'll see foo/nbar if successful."
-      RenderBlock {DIV} at (0,56) size 784x36
-        RenderBlock {DIV} at (0,0) size 784x36
-          RenderBlock {PRE} at (0,0) size 784x36
+      RenderBlock {DIV} at (0,53) size 784x32
+        RenderBlock {DIV} at (0,0) size 784x32
+          RenderBlock {PRE} at (0,0) size 784x32
             RenderBlock (anonymous) at (0,0) size 784x0
               RenderInline {SPAN} at (0,0) size 0x0
-            RenderBlock (anonymous) at (0,0) size 784x36
-              RenderBlock {PRE} at (0,0) size 784x36
-                RenderText {#text} at (0,0) size 30x36
-                  text run at (0,0) width 30: "foo"
-                  text run at (30,0) width 0: " "
-                  text run at (0,18) width 30: "bar"
-            RenderBlock (anonymous) at (0,52) size 784x0
+            RenderBlock (anonymous) at (0,0) size 784x32
+              RenderBlock {PRE} at (0,0) size 784x32
+                RenderText {#text} at (0,0) size 24x32
+                  text run at (0,0) width 24: "foo"
+                  text run at (24,0) width 0: " "
+                  text run at (0,16) width 24: "bar"
+            RenderBlock (anonymous) at (0,45) size 784x0
               RenderInline {SPAN} at (0,0) size 0x0
 caret: position 7 of child 0 {#text} of child 0 {PRE} of child 0 {SPAN} of child 1 {PRE} of child 1 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/block-style-004-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/block-style-004-expected.txt
index 1424537..12149d6 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/block-style-004-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/block-style-004-expected.txt
@@ -53,11 +53,10 @@ layer at (0,0) size 800x600
           RenderInline {SPAN} at (0,0) size 0x55
             RenderBR {BR} at (0,1) size 0x55
         RenderBlock {DIV} at (0,114) size 784x57
-          RenderInline {FONT} at (0,0) size 0x55
-            RenderInline {SPAN} at (0,0) size 0x55
-              RenderBR {BR} at (0,1) size 0x55
+          RenderInline {SPAN} at (0,0) size 0x55
+            RenderBR {BR} at (0,1) size 0x55
         RenderBlock {DIV} at (0,171) size 784x57
           RenderInline {SPAN} at (0,0) size 24x55
             RenderText {#text} at (0,1) size 24x55
               text run at (0,1) width 24: "x"
-caret: position 0 of child 0 {BR} of child 0 {SPAN} of child 0 {FONT} of child 3 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+caret: position 0 of child 0 {BR} of child 0 {SPAN} of child 3 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/block-style-005-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/block-style-005-expected.txt
index ae548c5..5c3d67e 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/block-style-005-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/block-style-005-expected.txt
@@ -56,7 +56,6 @@ layer at (0,0) size 800x600
           RenderInline {SPAN} at (0,0) size 0x55
             RenderBR {BR} at (0,1) size 0x55
         RenderBlock {DIV} at (0,114) size 784x57
-          RenderInline {FONT} at (0,0) size 0x55
-            RenderInline {SPAN} at (0,0) size 0x55
-              RenderBR {BR} at (0,1) size 0x55
-caret: position 0 of child 0 {BR} of child 0 {SPAN} of child 0 {FONT} of child 3 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+          RenderInline {SPAN} at (0,0) size 0x55
+            RenderBR {BR} at (0,1) size 0x55
+caret: position 0 of child 0 {BR} of child 0 {SPAN} of child 3 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/block-style-006-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/block-style-006-expected.txt
index 6df058f1..4828b2f 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/block-style-006-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/block-style-006-expected.txt
@@ -54,9 +54,8 @@ layer at (0,0) size 800x600
           RenderInline {SPAN} at (0,0) size 0x55
             RenderBR {BR} at (0,1) size 0x55
         RenderBlock {DIV} at (0,114) size 784x57
-          RenderInline {FONT} at (0,0) size 0x55
-            RenderInline {SPAN} at (0,0) size 0x55
-              RenderBR {BR} at (0,1) size 0x55
+          RenderInline {SPAN} at (0,0) size 0x55
+            RenderBR {BR} at (0,1) size 0x55
         RenderBlock {DIV} at (0,171) size 784x57
           RenderInline {SPAN} at (0,0) size 24x55
             RenderText {#text} at (0,1) size 24x55
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index c832e685..27096b2 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2399,15 +2399,6 @@ BUG11482 : LayoutTests/svg/custom/polyline-points-crash.html = CRASH
 BUG11502 WIN : LayoutTests/svg/css/glyph-orientation-rounding-test.xhtml = CRASH PASS
 
 // Regressions from WebKit merge 43242:43321
-BUG_DARIN WIN LINUX : LayoutTests/editing/deleting/delete-br-011.html = FAIL
-BUG_DARIN WIN LINUX : LayoutTests/editing/deleting/delete-select-all-001.html = FAIL
-BUG_DARIN WIN LINUX : LayoutTests/editing/execCommand/19089.html = FAIL
-BUG_DARIN WIN LINUX : LayoutTests/editing/execCommand/remove-formatting-2.html = FAIL
-BUG_DARIN WIN LINUX : LayoutTests/editing/pasteboard/5027857.html = FAIL
-BUG_DARIN WIN LINUX : LayoutTests/editing/pasteboard/paste-pre-002.html = FAIL
-BUG_DARIN WIN LINUX : LayoutTests/editing/style/block-style-004.html = FAIL
-BUG_DARIN WIN LINUX : LayoutTests/editing/style/block-style-005.html = FAIL
-BUG_DARIN WIN LINUX : LayoutTests/editing/style/block-style-006.html = FAIL
 BUG_DARIN WIN LINUX : LayoutTests/fast/forms/select-dirty-parent-pref-widths.html = FAIL
 BUG_DARIN WIN LINUX : LayoutTests/svg/transforms/text-with-pattern-inside-transformed-html.xhtml = FAIL
 BUG_DARIN WIN LINUX : LayoutTests/svg/transforms/text-with-pattern-with-svg-transform.svg = FAIL