Update some win/linux baselines after

http://trac.webkit.org/changeset/54933 .

BUG=36110
TBR=eseidel

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

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

5 files changed, 17 insertions, 25 deletions

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
deleted file mode 100644
index 7d5422b..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/19089-expected.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-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'; white-space: normal; "><hr></span></pre>
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5065605-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5065605-expected.txt
index 38035fe..694f2a5 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5065605-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5065605-expected.txt
@@ -22,12 +22,12 @@ layer at (0,0) size 800x600
                 RenderInline {FONT} at (0,0) size 141x19 [color=#FF0000]
                   RenderText {#text} at (0,0) size 141x19
                     text run at (0,0) width 141: "This text should be red."
-          RenderBlock (anonymous) at (0,20) size 784x20
-            RenderBlock {DIV} at (0,0) size 784x20
+          RenderBlock (anonymous) at (0,20) size 784x20 [color=#FF0000]
+            RenderBlock {DIV} at (0,0) size 784x20 [color=#000000]
               RenderInline {FONT} at (0,0) size 141x19 [color=#FF0000]
                 RenderText {#text} at (0,0) size 141x19
                   text run at (0,0) width 141: "This text should be red."
           RenderBlock (anonymous) at (0,40) size 784x0
             RenderInline {FONT} at (0,0) size 0x0 [color=#FF0000]
-              RenderInline {SPAN} at (0,0) size 0x0 [color=#000000]
-caret: position 24 of child 0 {#text} of child 0 {FONT} of child 1 {DIV} of child 0 {SPAN} of child 0 {FONT} of child 2 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+            RenderInline {FONT} at (0,0) size 0x0 [color=#FF0000]
+caret: position 24 of child 0 {#text} of child 0 {FONT} of child 1 {DIV} of child 0 {FONT} of child 2 {DIV} 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/5245519-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5245519-expected.txt
deleted file mode 100644
index 645909c..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5245519-expected.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-This tests for a crash when pasting content that contains Apple-style-spans that don't have renderers.' You should see 'Hello World!' We don't currently remove the empty invisible style span at paste time because it doesn't anticipate encountering non-inheritable styles on style spans, because we never create those at copy time.
-Hello <span style="display: none; " class="Apple-style-span"></span>World!
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-011-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-011-expected.txt
index 10823a6..1d98023 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-011-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-011-expected.txt
@@ -9,7 +9,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio
 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
 EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 0 of P > BODY > HTML > #document to 0 of P > BODY > HTML > #document givenAction:WebViewInsertActionPasted
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 5 of #text > B > FONT > P > SPAN > B > FONT > P > BODY > HTML > #document to 5 of #text > B > FONT > P > SPAN > B > FONT > P > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 5 of #text > B > FONT > P > B > FONT > P > BODY > HTML > #document to 5 of #text > B > FONT > P > B > FONT > P > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
 layer at (0,0) size 800x600
@@ -31,7 +31,6 @@ layer at (0,0) size 800x600
         RenderBlock (anonymous) at (0,0) size 784x0
           RenderInline {FONT} at (0,0) size 0x0
             RenderInline {B} at (0,0) size 0x0
-              RenderInline {SPAN} at (0,0) size 0x0
         RenderBlock (anonymous) at (0,0) size 784x56
           RenderBlock {P} at (0,0) size 784x20
             RenderInline {FONT} at (0,0) size 32x19
@@ -46,5 +45,6 @@ layer at (0,0) size 800x600
         RenderBlock (anonymous) at (0,72) size 784x0
           RenderInline {FONT} at (0,0) size 0x0
             RenderInline {B} at (0,0) size 0x0
-              RenderInline {SPAN} at (0,0) size 0x0
-caret: position 5 of child 0 {#text} of child 0 {B} of child 0 {FONT} of child 1 {P} of child 0 {SPAN} of child 0 {B} of child 0 {FONT} of child 4 {P} of child 1 {BODY} of child 0 {HTML} of document
+          RenderInline {FONT} at (0,0) size 0x0
+            RenderInline {B} at (0,0) size 0x0
+caret: position 5 of child 0 {#text} of child 0 {B} of child 0 {FONT} of child 1 {P} of child 0 {B} of child 0 {FONT} of child 4 {P} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-012-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-012-expected.txt
index a0447a8..c560886 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-012-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-012-expected.txt
@@ -7,7 +7,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 0 of DIV > DIV > SPAN > DIV > BODY > HTML > #document to 0 of DIV > DIV > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 0 of DIV > DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
 layer at (0,0) size 800x600
@@ -32,16 +32,12 @@ layer at (0,0) size 800x600
             RenderText {#text} at (0,0) size 32x27
               text run at (0,0) width 32: "foo"
       RenderBlock {DIV} at (0,144) size 784x160 [border: (2px solid #FF0000)]
-        RenderBlock (anonymous) at (14,14) size 756x0
-          RenderInline {SPAN} at (0,0) size 0x0
-        RenderBlock (anonymous) at (14,14) size 756x132
-          RenderBlock {DIV} at (0,0) size 756x132 [border: (2px solid #FF0000)]
-            RenderBlock {DIV} at (14,38) size 728x28
-              RenderBlock {BLOCKQUOTE} at (40,0) size 648x28
-                RenderText {#text} at (0,0) size 32x27
-                  text run at (0,0) width 32: "foo"
-            RenderBlock {DIV} at (14,90) size 728x28
-              RenderBR {BR} at (0,0) size 0x27
+        RenderBlock {DIV} at (14,14) size 756x132 [border: (2px solid #FF0000)]
+          RenderBlock {DIV} at (14,38) size 728x28
+            RenderBlock {BLOCKQUOTE} at (40,0) size 648x28
+              RenderText {#text} at (0,0) size 32x27
+                text run at (0,0) width 32: "foo"
+          RenderBlock {DIV} at (14,90) size 728x28
+            RenderBR {BR} at (0,0) size 0x27
         RenderBlock (anonymous) at (14,146) size 756x0
-          RenderInline {SPAN} at (0,0) size 0x0
-caret: position 0 of child 0 {BR} of child 1 {DIV} of child 0 {DIV} of child 0 {SPAN} of child 7 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+caret: position 0 of child 0 {BR} of child 1 {DIV} of child 0 {DIV} of child 7 {DIV} of child 1 {BODY} of child 0 {HTML} of document