' ' is forced on SPACE between text nodes

' ' is forced on SPACE between text nodes https://bugs.webkit.org/show_bug.cgi?id=123163 Reviewed by Ryosuke Niwa. Merge - https://chromium.googlesource.com/chromium/src.git/+/8134eeb454ef76c72df8cd7c26f6141072c314cb When we rebalance white spaces, ' ' can be added as space under some conditions. This CL adds a condition that the next sibling text node should not exist. * Source/WebCore/editing/CompositeEditCommand.cpp: (CompositeEditCommand::rebalanceWhitespaceOnTextSubstring): Extend condition for "rebalanceString" to ensure that nextSibling text node should not exist * Source/WebCore/editing/Editing.cpp: Update variable name from "endIsEndOfParagraph" to "shouldEmitNBSPbeforeEnd" as needed * Source;WebCore/editing/Editing.h: Ditto * LayoutTests/platform/gtk/editing/pasteboard/merge-end-borders-expected.txt: Rebaselined * LayoutTests/platform/gtk/editing/pasteboard/paste-line-endings-006-expected.png: Rebaselined * LayoutTests/platform/gtk/editing/pasteboard/paste-line-006-expected.txt: Rebaselined * LayoutTests/platform/gtk/editing/pasteboard/paste-line-010-expected.txt: Rebaselined * LayoutTests/platform/gtk/editing/pasteboard/paste-line-010-expected.png: Rebaselined * LayoutTests/platform/gtk/editing/pasteboard/paste-text-009-expected.png: Rebaselined * LayoutTests/platform/gtk/editing/pasteboard/paste-text-009-expected.txt: Rebaselined * LayoutTests/platform/gtk/editing/pasteboard/unrendered-br-expected.txt: Rebaselined * LayoutTests/platform/ios-wk2/editing/pasteboard/5028447-expected.txt: Rebaselined * LayoutTests/platform/win/editing/execCommand/find-after-replace-expected.txt: Rebaselined * LayoutTests/platform/win/editing/execCommand/paste-1-expected.txt: Rebaselined * LayoutTests/accessibility/mac/find-replace-match-capitalization-expected.txt: Rebaselined * LayoutTests/accessibility/mac/find-replace-match-capitalization.html: Updated * LayoutTests/accessibility/mac/select-text-145575-expected.txt: Rebaselined * LayoutTests/accessibility/mac/select-text/select-text-7.html: Updated * LayoutTests/accessibility/mac/select-text/select-text-7-expected.txt: Rebaselined * LayoutTests/accessibility/mac/select-text/select-text-8.html: Updated * LayoutTests/accessibility/mac/select-text/select-text-8-expected.txt: Rebaselined * LayoutTests/accessibility/mac/select-text/select-text-9.html: Updated * LayoutTests/accessibility/mac/select-text/select-text-9-expected.txt: Rebaselined * LayoutTests/editing/pasteboard/paste-text-003-expected.txt: Rebaselined * LayoutTests/platform/gtk/editing/execCommand/paste-1-expected.txt: Rebaselined * LayoutTests/platform/gtk/editing/pasteboard/paste-2-expected.txt: Rebaselined * LayoutTests/platform/mac/editing/pasteboard/unrendered-br-expected.png: Rebaselined * LayoutTests/platform/mac/editing/pasteboard/unrendered-br-expected.txt: Rebaselined * LayoutTests/accessibility/mac/select-text/select-text-135575.html: Updated to use "js-test.js" * LayoutTests/platform/gtk/editing/pasteboard/5028447-expected.txt: Rebaselined * LayoutTests/platform/gtk/editing/pasteboard/paste-line-endings-006-expected.txt: Rebaselined * LayoutTests/platform/gtk/editing/pasteboard/paste-line-endings-010-expected.txt: Rebaselined * LayoutTests/platform/gtk/editing/pasteboard/paste-text-009-expected.txt: Rebaselined * LayoutTests/platform/mac/editing/execCommand/paste-1-expected.png: Rebaselined * LayoutTests/platform/mac/editing/execCommand/paste-1-expected.txt: Rebaselined * LayoutTests/platform/mac/editing/pasteboard/5028447-expected.txt: Rebaselined * LayoutTests/platform/mac/editing/pasteboard/5028447-expected.png: Rebaselined * LayoutTests/platform/mac/editing/pasteboard/merge-end-borders-expected.png: Rebaselined * LayoutTests/platform/mac/editing/pasteboard/merge-end-borders-expected.txt: Rebaselined * LayoutTests/platform/mac/editing/pasteboard/paste-2-expected.png: Rebaselined * LayoutTests/platform/mac/editing/pasteboard/paste-2-expected.txt: Rebaselined * LayoutTests/platform/ios-wk2/editing/pasteboard/paste-text-009-expected.txt: Rebaselined * LayoutTests/platform/ios-wk2/editing/pasteboard/paste-text-at-tabspan-003-expected.txt: Rebaselined * LayoutTests/platform/ios-wk2/editing/pasteboard/unrendered-br-expected.txt: Rebaselined * LayoutTests/platform/ios/editing/pasteboard/paste-line-endings-006-expected.txt: Rebaselined * LayoutTests/platform/ios/editing/pasteboard/paste-line-endings-010-expected.txt: Rebaselined * LayoutTests/platform/ios/editing/pasteboard/paste-text-003-expected.txt: Rebaselined * LayoutTests/platform/ios-wk2/editing/pasteboard/unrendered-br-expected.txt: Rebaselined * LayoutTests/platform/mac-wk1/editing/execCommand/find-after-replace-expected.txt: Added Platform Specific Expectation * LayoutTests/platform/mac-wk1/editing/mac/spelling/autocorrection-blockquote-crash-expected.txt: Added Platform Specific Expectation * LayoutTests/platform/mac-wk1/fast/lists/drag-into-marker-expected.txt: Added Platform Specific Expectation Canonical link: https://commits.webkit.org/257136@main
WebKit · Nov 29, 2022 · 54804ca28d80d0d3999bb0e385ce616399b7e9e0 · 54804ca
1 parent 2d88fb5
commit 54804ca28d80d0d3999bb0e385ce616399b7e9e0
Show file tree

Hide file tree

Showing 44 changed files with 131 additions and 95 deletions.
diff --git a/LayoutTests/accessibility/mac/find-and-replace-match-capitalization-expected.txt b/LayoutTests/accessibility/mac/find-and-replace-match-capitalization-expected.txt
@@ -1,13 +1,13 @@
-The Test test TEST.
+The Test test TEST.
 
 This tests that find and replace will match the capitalization of the replaced word.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-PASS document.getElementById('text').innerHTML is 'The&nbsp;Test&nbsp;jumped high.'
-PASS document.getElementById('text').innerHTML is 'The&nbsp;Test&nbsp;test&nbsp;high.'
-PASS document.getElementById('text').innerHTML is 'The&nbsp;Test&nbsp;test&nbsp;TEST.'
+PASS document.getElementById('text').innerHTML is 'The Test&nbsp;jumped high.'
+PASS document.getElementById('text').innerHTML is 'The Test test&nbsp;high.'
+PASS document.getElementById('text').innerHTML is 'The Test test TEST.'
 PASS successfullyParsed is true
 
 TEST COMPLETE

diff --git a/LayoutTests/accessibility/mac/find-and-replace-match-capitalization.html b/LayoutTests/accessibility/mac/find-and-replace-match-capitalization.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script src="../../resources/js-test-pre.js"></script>
+<script src="../../resources/js-test.js"></script>
 <title>Select Text</title>
 </head>
 <body>
@@ -20,19 +20,16 @@
 
         // 'Man' is capitalized, so the replaced text should end up capitalized.
         var result = text.selectTextWithCriteria("AXSelectTextAmbiguityResolutionClosestToSelection", "man", "test");
-        shouldBe("document.getElementById('text').innerHTML", "'The&nbsp;Test&nbsp;jumped high.'");
+        shouldBe("document.getElementById('text').innerHTML", "'The Test&nbsp;jumped high.'");
 
         // 'jumped' is not capitalized so the text should not be capitalized.
         result = text.selectTextWithCriteria("AXSelectTextAmbiguityResolutionClosestToSelection", "jumped", "Test");
-        shouldBe("document.getElementById('text').innerHTML", "'The&nbsp;Test&nbsp;test&nbsp;high.'");
+        shouldBe("document.getElementById('text').innerHTML", "'The Test test&nbsp;high.'");
 
         // The replacement text was all caps, so don't change based on the existing text.
         result = text.selectTextWithCriteria("AXSelectTextAmbiguityResolutionClosestToSelection", "high", "TEST");
-        shouldBe("document.getElementById('text').innerHTML", "'The&nbsp;Test&nbsp;test&nbsp;TEST.'");
-
+        shouldBe("document.getElementById('text').innerHTML", "'The Test test TEST.'");
     }
 </script>
-
-<script src="../../resources/js-test-post.js"></script>
 </body>
 </html>
diff --git a/LayoutTests/accessibility/mac/select-text/select-text-135575-expected.txt b/LayoutTests/accessibility/mac/select-text/select-text-135575-expected.txt
@@ -1,6 +1,6 @@
 The quick brown fox jumps over the lazy dog.
 
-TEXT2: THE quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
+TEXT2: THE quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
 
 This tests the ability to select and replace text with respect to selection.
 

diff --git a/LayoutTests/accessibility/mac/select-text/select-text-135575.html b/LayoutTests/accessibility/mac/select-text/select-text-135575.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script src="../../../resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test.js"></script>
 <title>Select Text</title>
 </head>
 <body>
@@ -57,7 +57,5 @@
         shouldBe("windowSelection.getRangeAt(0).endOffset", "10");
     }
 </script>
-
-<script src="../../../resources/js-test-post.js"></script>
 </body>
 </html>
diff --git a/LayoutTests/accessibility/mac/select-text/select-text-7-expected.txt b/LayoutTests/accessibility/mac/select-text/select-text-7-expected.txt
@@ -1,4 +1,4 @@
-The slow brown fox jumps over the lazy dog.
+The slow brown fox jumps over the lazy dog.
 
 TEXT2: The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
 

diff --git a/LayoutTests/accessibility/mac/select-text/select-text-7.html b/LayoutTests/accessibility/mac/select-text/select-text-7.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script src="../../../resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test.js"></script>
 <title>Select Text</title>
 </head>
 <body>
@@ -43,7 +43,5 @@
         shouldBe("selection", "'slow'");
     }
 </script>
-
-<script src="../../../resources/js-test-post.js"></script>
 </body>
 </html>
diff --git a/LayoutTests/accessibility/mac/select-text/select-text-8-expected.txt b/LayoutTests/accessibility/mac/select-text/select-text-8-expected.txt
@@ -1,4 +1,4 @@
-The quick brown cat jumps over the lazy dog.
+The quick brown cat jumps over the lazy dog.
 
 TEXT2: The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
 

diff --git a/LayoutTests/accessibility/mac/select-text/select-text-8.html b/LayoutTests/accessibility/mac/select-text/select-text-8.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script src="../../../resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test.js"></script>
 <title>Select Text</title>
 </head>
 <body>
@@ -43,7 +43,5 @@
         shouldBe("selection", "'cat'");
     }
 </script>
-
-<script src="../../../resources/js-test-post.js"></script>
 </body>
 </html>
diff --git a/LayoutTests/accessibility/mac/select-text/select-text-9-expected.txt b/LayoutTests/accessibility/mac/select-text/select-text-9-expected.txt
@@ -1,4 +1,4 @@
-The quick Brown fox jumps over the lazy dog.
+The quick Brown fox jumps over the lazy dog.
 
 TEXT2: The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
 

diff --git a/LayoutTests/accessibility/mac/select-text/select-text-9.html b/LayoutTests/accessibility/mac/select-text/select-text-9.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script src="../../../resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test.js"></script>
 <title>Select Text</title>
 </head>
 <body>
@@ -43,7 +43,5 @@
         shouldBe("selection", "'Brown'");
     }
 </script>
-
-<script src="../../../resources/js-test-post.js"></script>
 </body>
 </html>
diff --git a/LayoutTests/editing/pasteboard/paste-text-003-expected.txt b/LayoutTests/editing/pasteboard/paste-text-003-expected.txt
@@ -106,12 +106,12 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio
 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
 This test copies and pastes "is a tide in the affairs of men,\nWhich taken at the flood leads on to fortune.\nOmitted" twice.
 
-There is a tide in the affairs of men,
+There is a tide in the affairs of men,
 Which taken at the flood leads on to fortune.
 Omittedis a tide in the affairs of men,
 Which taken at the flood leads on to fortune.
 Omitted, all the voyage of their life,
 Is bound in shallows and in miseries.
 execCopyCommand: <div id="test" class="editing">There is a tide in the affairs of men, <div class="editing">Which taken at the flood leads on to fortune. <div class="editing">Omitted, all the voyage of their life, <div class="editing">Is bound in shallows and in miseries. </div> </div> </div> </div>
-execPasteCommand: <div id="test" class="editing">There&nbsp;is a tide in the affairs of men,<div class="editing">Which taken at the flood leads on to fortune.</div><div class="editing"><div class="editing">Omitted, all the voyage of their life, <div class="editing">Is bound in shallows and in miseries. </div> </div> </div> </div>
-execPasteCommand: <div id="test" class="editing">There&nbsp;is a tide in the affairs of men,<div class="editing">Which taken at the flood leads on to fortune.</div><div class="editing"><div class="editing">Omittedis a tide in the affairs of men,</div><div class="editing">Which taken at the flood leads on to fortune.</div><div class="editing">Omitted, all the voyage of their life, <div class="editing">Is bound in shallows and in miseries. </div> </div> </div> </div>
+execPasteCommand: <div id="test" class="editing">There is a tide in the affairs of men,<div class="editing">Which taken at the flood leads on to fortune.</div><div class="editing"><div class="editing">Omitted, all the voyage of their life, <div class="editing">Is bound in shallows and in miseries. </div> </div> </div> </div>
+execPasteCommand: <div id="test" class="editing">There is a tide in the affairs of men,<div class="editing">Which taken at the flood leads on to fortune.</div><div class="editing"><div class="editing">Omittedis a tide in the affairs of men,</div><div class="editing">Which taken at the flood leads on to fortune.</div><div class="editing">Omitted, all the voyage of their life, <div class="editing">Is bound in shallows and in miseries. </div> </div> </div> </div>
diff --git a/LayoutTests/platform/gtk/editing/execCommand/paste-1-expected.txt b/LayoutTests/platform/gtk/editing/execCommand/paste-1-expected.txt
@@ -10,7 +10,8 @@ EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 7 of #text > BODY > HT
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
 EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document givenAction:WebViewInsertActionPasted
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document toDOMRange:range from 11 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 7 of #text > BODY > HTML > #document to 7 of #text > BODY > HTML > #document toDOMRange:range from 11 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
 layer at (0,0) size 800x600
@@ -30,7 +31,5 @@ layer at (0,0) size 800x600
             RenderBlock {HTML} at (0,0) size 300x150
               RenderBody {BODY} at (8,8) size 284x134 [bgcolor=#FFFFE0]
                 RenderText {#text} at (0,0) size 71x17
-                  text run at (0,0) width 45: "foo bar"
-                  text run at (45,0) width 4: " "
-                  text run at (49,0) width 22: "baz"
+                  text run at (0,0) width 71: "foo bar baz"
         RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/5028447-expected.txt b/LayoutTests/platform/gtk/editing/pasteboard/5028447-expected.txt
@@ -4,9 +4,7 @@ layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
       RenderText {#text} at (0,0) size 785x55
-        text run at (0,0) width 412: "All the text here should be the same size."
-        text run at (412,0) width 6: " "
-        text run at (418,0) width 367: "All the text here should be the same "
+        text run at (0,0) width 785: "All the text here should be the same size. All the text here should be the same "
         text run at (0,28) width 45: "size."
         text run at (45,28) width 6: " "
       RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/platform/gtk/editing/pasteboard/merge-end-borders-expected.txt b/LayoutTests/platform/gtk/editing/pasteboard/merge-end-borders-expected.txt
@@ -29,9 +29,7 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,104) size 784x38
         RenderBlock (anonymous) at (0,0) size 784x18
           RenderText {#text} at (0,0) size 95x17
-            text run at (0,0) width 28: "First"
-            text run at (28,0) width 4: " "
-            text run at (32,0) width 63: "paragraph"
+            text run at (0,0) width 95: "First paragraph"
         RenderBlock {DIV} at (0,18) size 784x20 [border: (1px solid #FF0000)]
           RenderText {#text} at (1,1) size 299x17
             text run at (1,1) width 299: "This text should be surrounded by a red border."

diff --git a/LayoutTests/platform/gtk/editing/pasteboard/paste-2-expected.txt b/LayoutTests/platform/gtk/editing/pasteboard/paste-2-expected.txt
@@ -10,7 +10,8 @@ EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 7 of #text > BODY > HT
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
 EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document givenAction:WebViewInsertActionPasted
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document toDOMRange:range from 11 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 7 of #text > BODY > HTML > #document to 7 of #text > BODY > HTML > #document toDOMRange:range from 11 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
 layer at (0,0) size 800x600
@@ -30,7 +31,5 @@ layer at (0,0) size 800x600
             RenderBlock {HTML} at (0,0) size 300x150
               RenderBody {BODY} at (8,8) size 284x134 [bgcolor=#FFFFE0]
                 RenderText {#text} at (0,0) size 71x17
-                  text run at (0,0) width 45: "foo bar"
-                  text run at (45,0) width 4: " "
-                  text run at (49,0) width 22: "baz"
+                  text run at (0,0) width 71: "foo bar baz"
         RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/paste-line-endings-006-expected.png b/LayoutTests/platform/gtk/editing/pasteboard/paste-line-endings-006-expected.png
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/paste-line-endings-010-expected.png b/LayoutTests/platform/gtk/editing/pasteboard/paste-line-endings-010-expected.png
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/paste-text-009-expected.png b/LayoutTests/platform/gtk/editing/pasteboard/paste-text-009-expected.png
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/unrendered-br-expected.txt b/LayoutTests/platform/gtk/editing/pasteboard/unrendered-br-expected.txt
@@ -2,7 +2,8 @@ EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML
 EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 6 of #text > DIV > BODY > HTML > #document to 6 of #text > DIV > BODY > HTML > #document toDOMRange:range from 17 of #text > DIV > DIV > BODY > HTML > #document to 17 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 5 of #text > DIV > BODY > HTML > #document to 5 of #text > DIV > BODY > HTML > #document toDOMRange:range from 17 of #text > DIV > DIV > BODY > HTML > #document to 17 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
 layer at (0,0) size 800x600
@@ -17,9 +18,7 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,52) size 784x36
         RenderBlock (anonymous) at (0,0) size 784x18
           RenderText {#text} at (0,0) size 99x17
-            text run at (0,0) width 28: "First"
-            text run at (28,0) width 4: " "
-            text run at (32,0) width 67: "paragraph."
+            text run at (0,0) width 99: "First paragraph."
         RenderBlock {DIV} at (0,18) size 784x18
           RenderText {#text} at (0,0) size 118x17
             text run at (0,0) width 118: "Second paragraph."

diff --git a/LayoutTests/platform/ios-wk2/editing/pasteboard/5028447-expected.txt b/LayoutTests/platform/ios-wk2/editing/pasteboard/5028447-expected.txt
@@ -4,9 +4,7 @@ layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
       RenderText {#text} at (0,1) size 782x60
-        text run at (0,1) width 411: "All the text here should be the same size."
-        text run at (410,1) width 7: " "
-        text run at (416,1) width 366: "All the text here should be the same "
+        text run at (0,1) width 782: "All the text here should be the same size. All the text here should be the same "
         text run at (0,32) width 46: "size."
         text run at (45,32) width 7: " "
       RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/platform/ios-wk2/editing/pasteboard/paste-text-009-expected.txt b/LayoutTests/platform/ios-wk2/editing/pasteboard/paste-text-009-expected.txt
@@ -86,6 +86,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio
 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
 EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 2 of #text > DIV > BODY > HTML > #document to 2 of #text > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 2 of #text > DIV > BODY > HTML > #document to 2 of #text > DIV > BODY > HTML > #document toDOMRange:range from 2 of #text > DIV > BODY > HTML > #document to 2 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification

diff --git a/LayoutTests/platform/ios-wk2/editing/pasteboard/paste-text-at-tabspan-003-expected.txt b/LayoutTests/platform/ios-wk2/editing/pasteboard/paste-text-at-tabspan-003-expected.txt
@@ -10,8 +10,7 @@ EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range fr
 EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 3 of #text > SPAN > SPAN > DIV > BODY > HTML > #document to 3 of #text > SPAN > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 2 of #text > SPAN > DIV > BODY > HTML > #document to 2 of #text > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of #text > SPAN > DIV > BODY > HTML > #document to 1 of #text > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 3 of #text > SPAN > DIV > BODY > HTML > #document to 3 of #text > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 2 of #text > SPAN > DIV > BODY > HTML > #document to 2 of #text > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 3 of #text > SPAN > DIV > BODY > HTML > #document to 3 of #text > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
 layer at (0,0) size 800x600

diff --git a/LayoutTests/platform/ios-wk2/editing/pasteboard/unrendered-br-expected.txt b/LayoutTests/platform/ios-wk2/editing/pasteboard/unrendered-br-expected.txt
@@ -2,7 +2,8 @@ EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML
 EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 6 of #text > DIV > BODY > HTML > #document to 6 of #text > DIV > BODY > HTML > #document toDOMRange:range from 17 of #text > DIV > DIV > BODY > HTML > #document to 17 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 5 of #text > DIV > BODY > HTML > #document to 5 of #text > DIV > BODY > HTML > #document toDOMRange:range from 17 of #text > DIV > DIV > BODY > HTML > #document to 17 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
 layer at (0,0) size 800x600
@@ -17,9 +18,7 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,56) size 784x40
         RenderBlock (anonymous) at (0,0) size 784x20
           RenderText {#text} at (0,0) size 102x19
-            text run at (0,0) width 30: "First"
-            text run at (29,0) width 5: " "
-            text run at (33,0) width 69: "paragraph."
+            text run at (0,0) width 102: "First paragraph."
         RenderBlock {DIV} at (0,20) size 784x20
           RenderText {#text} at (0,0) size 120x19
             text run at (0,0) width 120: "Second paragraph."

diff --git a/LayoutTests/platform/ios/editing/pasteboard/paste-line-endings-006-expected.txt b/LayoutTests/platform/ios/editing/pasteboard/paste-line-endings-006-expected.txt
@@ -48,7 +48,5 @@ layer at (0,0) size 800x600
             text run at (2,3) width 77: "line one"
           RenderBR {BR} at (78,3) size 1x28
           RenderText {#text} at (2,33) size 84x28
-            text run at (2,33) width 7: "l"
-            text run at (8,33) width 7: " "
-            text run at (14,33) width 72: "ine two"
+            text run at (2,33) width 84: "l ine two"
 caret: position 2 of child 2 {#text} of child 1 {DIV} of child 3 {DIV} of body
diff --git a/LayoutTests/platform/ios/editing/pasteboard/paste-line-endings-010-expected.txt b/LayoutTests/platform/ios/editing/pasteboard/paste-line-endings-010-expected.txt
@@ -50,7 +50,5 @@ layer at (0,0) size 800x600
                 text run at (0,1) width 77: "line one"
             RenderBlock (anonymous) at (0,30) size 780x30
               RenderText {#text} at (0,1) size 84x28
-                text run at (0,1) width 7: "l"
-                text run at (6,1) width 7: " "
-                text run at (12,1) width 72: "ine two"
+                text run at (0,1) width 84: "l ine two"
 caret: position 2 of child 1 {#text} of child 1 {DIV} of child 1 {DIV} of child 3 {DIV} of body