Merge: chromium side [42671:42725]...

webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-015-expected.txt

Index: webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-015-expected.txt
===================================================================
--- webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-015-expected.txt	(revision 14126)
+++ webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-015-expected.txt	(working copy)
@@ -16,15 +16,15 @@
 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
 EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 0 of P > DIV > DIV > BODY > HTML > #document to 0 of P > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 3 of #text > P > DIV > DIV > SPAN > P > DIV > DIV > BODY > HTML > #document to 3 of #text > P > DIV > DIV > SPAN > P > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 3 of #text > P > P > DIV > DIV > BODY > HTML > #document to 3 of #text > P > P > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 3 of #text > P > DIV > DIV > SPAN > P > DIV > DIV > BODY > HTML > #document to 3 of #text > P > DIV > DIV > SPAN > P > DIV > DIV > BODY > HTML > #document toDOMRange:range from 0 of P > DIV > DIV > SPAN > P > DIV > DIV > BODY > HTML > #document to 0 of P > DIV > DIV > SPAN > P > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 3 of #text > P > P > DIV > DIV > BODY > HTML > #document to 3 of #text > P > P > DIV > DIV > BODY > HTML > #document toDOMRange:range from 0 of P > P > DIV > DIV > BODY > HTML > #document to 0 of P > P > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 0 of P > DIV > DIV > SPAN > P > DIV > DIV > BODY > HTML > #document to 0 of P > DIV > DIV > SPAN > P > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
+EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 0 of P > P > DIV > DIV > BODY > HTML > #document to 0 of P > P > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 3 of #text > P > DIV > DIV > SPAN > P > DIV > DIV > SPAN > P > DIV > DIV > BODY > HTML > #document to 3 of #text > P > DIV > DIV > SPAN > P > DIV > DIV > SPAN > P > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 3 of #text > P > P > P > DIV > DIV > BODY > HTML > #document to 3 of #text > P > P > P > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
 layer at (0,0) size 800x600
@@ -32,34 +32,22 @@
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {DIV} at (0,0) size 784x196
-        RenderBlock {DIV} at (0,0) size 784x196 [border: (2px solid #FF0000)]
-          RenderBlock {P} at (14,14) size 756x168
-            RenderBlock (anonymous) at (0,0) size 756x0
-              RenderInline {SPAN} at (0,0) size 0x0
-            RenderBlock (anonymous) at (0,0) size 756x168
-              RenderBlock {DIV} at (0,0) size 756x168
-                RenderBlock {DIV} at (0,0) size 756x168 [border: (2px solid #FF0000)]
-                  RenderBlock {P} at (14,14) size 728x28
-                    RenderText {#text} at (0,0) size 32x27
-                      text run at (0,0) width 32: "foo"
-                  RenderBlock {P} at (14,42) size 728x28
-                    RenderText {#text} at (0,0) size 31x27
-                      text run at (0,0) width 31: "bar"
-                  RenderBlock {P} at (14,70) size 728x84
-                    RenderBlock (anonymous) at (0,0) size 728x0
-                      RenderInline {SPAN} at (0,0) size 0x0
-                    RenderBlock (anonymous) at (0,0) size 728x84
-                      RenderBlock {DIV} at (0,0) size 728x84
-                        RenderBlock {DIV} at (0,0) size 728x84 [border: (2px solid #FF0000)]
-                          RenderBlock {P} at (14,14) size 700x28
-                            RenderText {#text} at (0,0) size 32x27
-                              text run at (0,0) width 32: "foo"
-                          RenderBlock {P} at (14,42) size 700x28
-                            RenderText {#text} at (0,0) size 31x27
-                              text run at (0,0) width 31: "bar"
-                    RenderBlock (anonymous) at (0,84) size 728x0
-                      RenderInline {SPAN} at (0,0) size 0x0
-            RenderBlock (anonymous) at (0,168) size 756x0
-              RenderInline {SPAN} at (0,0) size 0x0
-caret: position 3 of child 0 {#text} of child 1 {P} of child 0 {DIV} of child 0 {DIV} of child 0 {SPAN} of child 2 {P} of child 0 {DIV} of child 0 {DIV} of child 0 {SPAN} of child 0 {P} of child 1 {DIV} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+      RenderBlock {DIV} at (0,0) size 784x140
+        RenderBlock {DIV} at (0,0) size 784x140 [border: (2px solid #FF0000)]
+          RenderBlock {P} at (14,14) size 756x112
+            RenderBlock {P} at (0,0) size 756x28
+              RenderText {#text} at (0,0) size 32x27
+                text run at (0,0) width 32: "foo"
+            RenderBlock {P} at (0,28) size 756x28
+              RenderText {#text} at (0,0) size 31x27
+                text run at (0,0) width 31: "bar"
+            RenderBlock (anonymous) at (0,56) size 756x0
+            RenderBlock {P} at (0,56) size 756x56
+              RenderBlock {P} at (0,0) size 756x28
+                RenderText {#text} at (0,0) size 32x27
+                  text run at (0,0) width 32: "foo"
+              RenderBlock {P} at (0,28) size 756x28
+                RenderText {#text} at (0,0) size 31x27
+                  text run at (0,0) width 31: "bar"
+              RenderBlock (anonymous) at (0,56) size 756x0
+caret: position 3 of child 0 {#text} of child 1 {P} of child 2 {P} of child 0 {P} of child 1 {DIV} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document