Changeset 231630 in webkit

Timestamp:

May 9, 2018 11:39:01 PM (6 years ago)

Author:

rniwa@webkit.org

Message:

Markup.dump should dump selection focus & anchor at the root node
​https://bugs.webkit.org/show_bug.cgi?id=185497

Reviewed by Wenson Hsieh.

Added the support for logging selection end points (anchor & focus) for when they're
anchored against the root node passed to Markup.dump.

• editing/deleting/delete-across-editable-content-boundaries-1-expected.txt:
• editing/deleting/delete-image-followed-by-two-br-expected.txt:
• editing/deleting/delete-start-block-expected.txt:
• editing/deleting/delete-word-from-unstyled-div-expected.txt:
• editing/deleting/deleting-relative-positioned-special-element-expected.txt:
• editing/deleting/smart-delete-across-editable-boundaries-2-expected.txt:
• editing/deleting/smart-delete-across-editable-boundaries-expected.txt:
• editing/execCommand/break-non-editable-blockquote-expected.txt:
• editing/execCommand/format-block-table-expected.txt:
• editing/execCommand/indent-img-twice-expected.txt:
• editing/execCommand/remove-format-textdecoration-in-iframe-expected.txt:
• editing/inserting/5607069-2-expected.txt:
• editing/inserting/5994480-2-expected.txt:
• editing/inserting/insert-list-in-table-cell-03-expected.txt:
• editing/inserting/insert-list-in-table-cell-04-expected.txt:
• editing/inserting/insert-list-in-table-cell-07-expected.txt:
• editing/inserting/insert-list-in-table-cell-08-expected.txt:
• editing/inserting/insert-table-in-paragraph-crash-expected.txt:
• editing/pasteboard/copy-null-characters-expected.txt:
• editing/pasteboard/copy-paste-content-starting-and-ending-canvas-expected.txt:
• editing/pasteboard/paste-blockquote-and-paragraph-break-expected.txt:
• editing/pasteboard/paste-table-with-unrendered-text-nodes-expected.txt:
• editing/pasteboard/pasting-into-h6-should-not-nest-h6-expected.txt:
• editing/pasteboard/pasting-into-p-should-not-nest-p-expected.txt:
• editing/style/apply-style-atomic-expected.txt:
• fast/events/5056619-expected.txt:
• platform/ios/editing/deleting/delete-emoji-1-expected.txt:
• platform/ios/editing/deleting/delete-emoji-2-expected.txt:
• platform/ios/editing/deleting/delete-emoji-3-expected.txt:
• platform/ios/editing/deleting/delete-emoji-4-expected.txt:
• platform/ios/editing/deleting/delete-emoji-5-expected.txt:
• platform/ios/editing/deleting/delete-emoji-6-expected.txt:
• platform/ios/editing/deleting/delete-emoji-7-expected.txt:
• platform/ios/editing/deleting/delete-emoji-8-expected.txt:
• platform/ios/editing/deleting/delete-emoji-9-expected.txt:
• platform/ios/editing/deleting/delete-emoji-expected.txt:
• platform/mac-sierra/editing/deleting/delete-emoji-1-expected.txt:
• platform/mac-sierra/editing/deleting/delete-emoji-2-expected.txt:
• platform/mac-sierra/editing/deleting/delete-emoji-3-expected.txt:
• platform/mac-sierra/editing/deleting/delete-emoji-4-expected.txt:
• platform/mac-sierra/editing/deleting/delete-emoji-5-expected.txt:
• platform/mac-sierra/editing/deleting/delete-emoji-6-expected.txt:
• platform/mac-sierra/editing/deleting/delete-emoji-7-expected.txt:
• platform/mac-sierra/editing/deleting/delete-emoji-8-expected.txt:
• platform/mac-sierra/editing/deleting/delete-emoji-9-expected.txt:
• platform/mac/editing/deleting/delete-emoji-1-expected.txt:
• platform/mac/editing/deleting/delete-emoji-2-expected.txt:
• platform/mac/editing/deleting/delete-emoji-3-expected.txt:
• platform/mac/editing/deleting/delete-emoji-4-expected.txt:
• platform/mac/editing/deleting/delete-emoji-5-expected.txt:
• platform/mac/editing/deleting/delete-emoji-6-expected.txt:
• platform/mac/editing/deleting/delete-emoji-7-expected.txt:
• platform/mac/editing/deleting/delete-emoji-8-expected.txt:
• platform/mac/editing/deleting/delete-emoji-9-expected.txt:
• platform/mac/editing/deleting/delete-emoji-expected.txt:
• platform/wincairo/editing/deleting/delete-emoji-1-expected.txt:
• platform/wincairo/editing/deleting/delete-emoji-2-expected.txt:
• platform/wincairo/editing/deleting/delete-emoji-3-expected.txt:
• platform/wincairo/editing/deleting/delete-emoji-4-expected.txt:
• platform/wincairo/editing/deleting/delete-emoji-5-expected.txt:
• platform/wincairo/editing/deleting/delete-emoji-6-expected.txt:
• platform/wincairo/editing/deleting/delete-emoji-7-expected.txt:
• platform/wincairo/editing/deleting/delete-emoji-8-expected.txt:
• platform/wincairo/editing/deleting/delete-emoji-9-expected.txt:
• resources/dump-as-markup.js:

(Markup): Added the logging of selection markers to the root node.ß∑
(Markup._get):
(Markup._getSelectionMarkerWithIdentation): Extracted out of Markup._get.

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• editing/deleting/delete-across-editable-content-boundaries-1-expected.txt (modified) (1 diff)
• editing/deleting/delete-image-followed-by-two-br-expected.txt (modified) (1 diff)
• editing/deleting/delete-start-block-expected.txt (modified) (1 diff)
• editing/deleting/delete-word-from-unstyled-div-expected.txt (modified) (1 diff)
• editing/deleting/deleting-relative-positioned-special-element-expected.txt (modified) (1 diff)
• editing/deleting/smart-delete-across-editable-boundaries-2-expected.txt (modified) (1 diff)
• editing/deleting/smart-delete-across-editable-boundaries-expected.txt (modified) (1 diff)
• editing/execCommand/break-non-editable-blockquote-expected.txt (modified) (1 diff)
• editing/execCommand/format-block-table-expected.txt (modified) (2 diffs)
• editing/execCommand/indent-img-twice-expected.txt (modified) (1 diff)
• editing/execCommand/remove-format-textdecoration-in-iframe-expected.txt (modified) (1 diff)
• editing/inserting/5607069-2-expected.txt (modified) (1 diff)
• editing/inserting/5994480-2-expected.txt (modified) (1 diff)
• editing/inserting/insert-list-in-table-cell-03-expected.txt (modified) (1 diff)
• editing/inserting/insert-list-in-table-cell-04-expected.txt (modified) (2 diffs)
• editing/inserting/insert-list-in-table-cell-07-expected.txt (modified) (1 diff)
• editing/inserting/insert-list-in-table-cell-08-expected.txt (modified) (2 diffs)
• editing/inserting/insert-table-in-paragraph-crash-expected.txt (modified) (1 diff)
• editing/pasteboard/copy-null-characters-expected.txt (modified) (1 diff)
• editing/pasteboard/copy-paste-content-starting-and-ending-canvas-expected.txt (modified) (3 diffs)
• editing/pasteboard/paste-blockquote-and-paragraph-break-expected.txt (modified) (1 diff)
• editing/pasteboard/paste-table-with-unrendered-text-nodes-expected.txt (modified) (3 diffs)
• editing/pasteboard/pasting-into-h6-should-not-nest-h6-expected.txt (modified) (1 diff)
• editing/pasteboard/pasting-into-p-should-not-nest-p-expected.txt (modified) (1 diff)
• editing/style/apply-style-atomic-expected.txt (modified) (1 diff)
• fast/events/5056619-expected.txt (modified) (1 diff)
• platform/ios/editing/deleting/delete-emoji-1-expected.txt (modified) (1 diff)
• platform/ios/editing/deleting/delete-emoji-2-expected.txt (modified) (1 diff)
• platform/ios/editing/deleting/delete-emoji-3-expected.txt (modified) (1 diff)
• platform/ios/editing/deleting/delete-emoji-4-expected.txt (modified) (1 diff)
• platform/ios/editing/deleting/delete-emoji-5-expected.txt (modified) (1 diff)
• platform/ios/editing/deleting/delete-emoji-6-expected.txt (modified) (1 diff)
• platform/ios/editing/deleting/delete-emoji-7-expected.txt (modified) (1 diff)
• platform/ios/editing/deleting/delete-emoji-8-expected.txt (modified) (1 diff)
• platform/ios/editing/deleting/delete-emoji-9-expected.txt (modified) (1 diff)
• platform/ios/editing/deleting/delete-emoji-expected.txt (modified) (1 diff)
• platform/mac-sierra/editing/deleting/delete-emoji-1-expected.txt (modified) (1 diff)
• platform/mac-sierra/editing/deleting/delete-emoji-2-expected.txt (modified) (1 diff)
• platform/mac-sierra/editing/deleting/delete-emoji-3-expected.txt (modified) (1 diff)
• platform/mac-sierra/editing/deleting/delete-emoji-4-expected.txt (modified) (1 diff)
• platform/mac-sierra/editing/deleting/delete-emoji-5-expected.txt (modified) (1 diff)
• platform/mac-sierra/editing/deleting/delete-emoji-6-expected.txt (modified) (1 diff)
• platform/mac-sierra/editing/deleting/delete-emoji-7-expected.txt (modified) (1 diff)
• platform/mac-sierra/editing/deleting/delete-emoji-8-expected.txt (modified) (1 diff)
• platform/mac-sierra/editing/deleting/delete-emoji-9-expected.txt (modified) (1 diff)
• platform/mac/editing/deleting/delete-emoji-1-expected.txt (modified) (1 diff)
• platform/mac/editing/deleting/delete-emoji-2-expected.txt (modified) (1 diff)
• platform/mac/editing/deleting/delete-emoji-3-expected.txt (modified) (1 diff)
• platform/mac/editing/deleting/delete-emoji-4-expected.txt (modified) (1 diff)
• platform/mac/editing/deleting/delete-emoji-5-expected.txt (modified) (1 diff)
• platform/mac/editing/deleting/delete-emoji-6-expected.txt (modified) (1 diff)
• platform/mac/editing/deleting/delete-emoji-7-expected.txt (modified) (1 diff)
• platform/mac/editing/deleting/delete-emoji-8-expected.txt (modified) (1 diff)
• platform/mac/editing/deleting/delete-emoji-9-expected.txt (modified) (1 diff)
• platform/mac/editing/deleting/delete-emoji-expected.txt (modified) (1 diff)
• platform/wincairo/editing/deleting/delete-emoji-1-expected.txt (modified) (1 diff)
• platform/wincairo/editing/deleting/delete-emoji-2-expected.txt (modified) (1 diff)
• platform/wincairo/editing/deleting/delete-emoji-3-expected.txt (modified) (1 diff)
• platform/wincairo/editing/deleting/delete-emoji-4-expected.txt (modified) (1 diff)
• platform/wincairo/editing/deleting/delete-emoji-5-expected.txt (modified) (1 diff)
• platform/wincairo/editing/deleting/delete-emoji-6-expected.txt (modified) (1 diff)
• platform/wincairo/editing/deleting/delete-emoji-7-expected.txt (modified) (1 diff)
• platform/wincairo/editing/deleting/delete-emoji-8-expected.txt (modified) (1 diff)
• platform/wincairo/editing/deleting/delete-emoji-9-expected.txt (modified) (1 diff)
• resources/dump-as-markup.js (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-05-09  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Markup.dump should dump selection focus & anchor at the root node
+        https://bugs.webkit.org/show_bug.cgi?id=185497
+
+        Reviewed by Wenson Hsieh.
+
+        Added the support for logging selection end points (anchor & focus) for when they're
+        anchored against the root node passed to Markup.dump.
+
+        * editing/deleting/delete-across-editable-content-boundaries-1-expected.txt:
+        * editing/deleting/delete-image-followed-by-two-br-expected.txt:
+        * editing/deleting/delete-start-block-expected.txt:
+        * editing/deleting/delete-word-from-unstyled-div-expected.txt:
+        * editing/deleting/deleting-relative-positioned-special-element-expected.txt:
+        * editing/deleting/smart-delete-across-editable-boundaries-2-expected.txt:
+        * editing/deleting/smart-delete-across-editable-boundaries-expected.txt:
+        * editing/execCommand/break-non-editable-blockquote-expected.txt:
+        * editing/execCommand/format-block-table-expected.txt:
+        * editing/execCommand/indent-img-twice-expected.txt:
+        * editing/execCommand/remove-format-textdecoration-in-iframe-expected.txt:
+        * editing/inserting/5607069-2-expected.txt:
+        * editing/inserting/5994480-2-expected.txt:
+        * editing/inserting/insert-list-in-table-cell-03-expected.txt:
+        * editing/inserting/insert-list-in-table-cell-04-expected.txt:
+        * editing/inserting/insert-list-in-table-cell-07-expected.txt:
+        * editing/inserting/insert-list-in-table-cell-08-expected.txt:
+        * editing/inserting/insert-table-in-paragraph-crash-expected.txt:
+        * editing/pasteboard/copy-null-characters-expected.txt:
+        * editing/pasteboard/copy-paste-content-starting-and-ending-canvas-expected.txt:
+        * editing/pasteboard/paste-blockquote-and-paragraph-break-expected.txt:
+        * editing/pasteboard/paste-table-with-unrendered-text-nodes-expected.txt:
+        * editing/pasteboard/pasting-into-h6-should-not-nest-h6-expected.txt:
+        * editing/pasteboard/pasting-into-p-should-not-nest-p-expected.txt:
+        * editing/style/apply-style-atomic-expected.txt:
+        * fast/events/5056619-expected.txt:
+        * platform/ios/editing/deleting/delete-emoji-1-expected.txt:
+        * platform/ios/editing/deleting/delete-emoji-2-expected.txt:
+        * platform/ios/editing/deleting/delete-emoji-3-expected.txt:
+        * platform/ios/editing/deleting/delete-emoji-4-expected.txt:
+        * platform/ios/editing/deleting/delete-emoji-5-expected.txt:
+        * platform/ios/editing/deleting/delete-emoji-6-expected.txt:
+        * platform/ios/editing/deleting/delete-emoji-7-expected.txt:
+        * platform/ios/editing/deleting/delete-emoji-8-expected.txt:
+        * platform/ios/editing/deleting/delete-emoji-9-expected.txt:
+        * platform/ios/editing/deleting/delete-emoji-expected.txt:
+        * platform/mac-sierra/editing/deleting/delete-emoji-1-expected.txt:
+        * platform/mac-sierra/editing/deleting/delete-emoji-2-expected.txt:
+        * platform/mac-sierra/editing/deleting/delete-emoji-3-expected.txt:
+        * platform/mac-sierra/editing/deleting/delete-emoji-4-expected.txt:
+        * platform/mac-sierra/editing/deleting/delete-emoji-5-expected.txt:
+        * platform/mac-sierra/editing/deleting/delete-emoji-6-expected.txt:
+        * platform/mac-sierra/editing/deleting/delete-emoji-7-expected.txt:
+        * platform/mac-sierra/editing/deleting/delete-emoji-8-expected.txt:
+        * platform/mac-sierra/editing/deleting/delete-emoji-9-expected.txt:
+        * platform/mac/editing/deleting/delete-emoji-1-expected.txt:
+        * platform/mac/editing/deleting/delete-emoji-2-expected.txt:
+        * platform/mac/editing/deleting/delete-emoji-3-expected.txt:
+        * platform/mac/editing/deleting/delete-emoji-4-expected.txt:
+        * platform/mac/editing/deleting/delete-emoji-5-expected.txt:
+        * platform/mac/editing/deleting/delete-emoji-6-expected.txt:
+        * platform/mac/editing/deleting/delete-emoji-7-expected.txt:
+        * platform/mac/editing/deleting/delete-emoji-8-expected.txt:
+        * platform/mac/editing/deleting/delete-emoji-9-expected.txt:
+        * platform/mac/editing/deleting/delete-emoji-expected.txt:
+        * platform/wincairo/editing/deleting/delete-emoji-1-expected.txt:
+        * platform/wincairo/editing/deleting/delete-emoji-2-expected.txt:
+        * platform/wincairo/editing/deleting/delete-emoji-3-expected.txt:
+        * platform/wincairo/editing/deleting/delete-emoji-4-expected.txt:
+        * platform/wincairo/editing/deleting/delete-emoji-5-expected.txt:
+        * platform/wincairo/editing/deleting/delete-emoji-6-expected.txt:
+        * platform/wincairo/editing/deleting/delete-emoji-7-expected.txt:
+        * platform/wincairo/editing/deleting/delete-emoji-8-expected.txt:
+        * platform/wincairo/editing/deleting/delete-emoji-9-expected.txt:
+        * resources/dump-as-markup.js:
+        (Markup): Added the logging of selection markers to the root node.ß∑
+        (Markup._get):
+        (Markup._getSelectionMarkerWithIdentation): Extracted out of Markup._get.
+
 2018-05-09  Nan Wang  <n_wang@apple.com>
 

trunk/LayoutTests/editing/deleting/delete-across-editable-content-boundaries-1-expected.txt

@@ -1 +1 @@
 This tests the deletion of non-editable content that both starts and ends in editable roots - it should successfully be removed. There should be no visible content in the markup below. <radr://problem/5026848>
+| <#selection-caret>
 | <br>

trunk/LayoutTests/editing/deleting/delete-image-followed-by-two-br-expected.txt

@@ -1 +1 @@
 We should be able to delete the br and then the image.
+| <#selection-caret>
 | <br>
 | "This is a line of text.

trunk/LayoutTests/editing/deleting/delete-start-block-expected.txt

@@ -2 +2 @@
 | <div>
 |   <br>
+| <#selection-caret>
 | <br>
 | <br>

trunk/LayoutTests/editing/deleting/delete-word-from-unstyled-div-expected.txt

@@ -2 +2 @@
 | "one"
 | <br>
+| <#selection-caret>
 | <br>

trunk/LayoutTests/editing/deleting/deleting-relative-positioned-special-element-expected.txt

@@ -15 +15 @@
 | <p>
 |   "1"
+| <#selection-caret>
 | <br>
 | <p>

trunk/LayoutTests/editing/deleting/smart-delete-across-editable-boundaries-2-expected.txt

@@ -1 +1 @@
 This tests for a bug where expansion for smart delete would not consider editable boundaries. Only 'foo' should be deleted. You should see ' bar'. <radr://problem/5390681>
+| <#selection-caret>
 | <span>
 |   contenteditable="false"

trunk/LayoutTests/editing/deleting/smart-delete-across-editable-boundaries-expected.txt

@@ -1 +1 @@
 This tests for a bug where expansion for smart delete would not consider editable boundaries. Only 'foo' should be deleted. You should see ' bar'. <radr://problem/5390681>
+| <#selection-caret>
 | <span>
 |   contenteditable="false"

trunk/LayoutTests/editing/execCommand/break-non-editable-blockquote-expected.txt

@@ -3 +3 @@
 |   type="cite"
 |   "hello"
+| <#selection-caret>
 | <br>
 | <blockquote>

trunk/LayoutTests/editing/execCommand/format-block-table-expected.txt

@@ -3 +3 @@
 | "
 "
+| <#selection-anchor>
 | <table>
 |   <tbody>
@@ -10 +11 @@
 |       <td>
 |         "world"
+| <#selection-focus>
 | "
 "

trunk/LayoutTests/editing/execCommand/indent-img-twice-expected.txt

@@ -2 +2 @@
 
 Initial state:
+| <#selection-anchor>
 | <img>
 |   src="../resources/abe.png"
+| <#selection-focus>
 
 After indenting once:

trunk/LayoutTests/editing/execCommand/remove-format-textdecoration-in-iframe-expected.txt

@@ -4 +4 @@
 | <iframe>
 |   onload="selectAndRemoveFormat()"
+| <#selection-focus>
 | "
         "

trunk/LayoutTests/editing/inserting/5607069-2-expected.txt

@@ -7 +7 @@
 |       contenteditable="plaintext-only"
 | <br>
+| <#selection-caret>
 | <input>
 |   type="text"

trunk/LayoutTests/editing/inserting/5994480-2-expected.txt

@@ -1 +1 @@
 This tests to see if deleting an input element that starts at the start of a block adds an extra placeholder.
 You should see a single placeholder in the block below.
+| <#selection-caret>
 | <br>

trunk/LayoutTests/editing/inserting/insert-list-in-table-cell-03-expected.txt

@@ -16 +16 @@
 |       <td>
 |         "fsfg"
+| <#selection-focus>
 
 After:

trunk/LayoutTests/editing/inserting/insert-list-in-table-cell-04-expected.txt

@@ -2 +2 @@
 
 Before:
+| <#selection-anchor>
 | <table>
 |   border="1"
@@ -16 +17 @@
 |       <td>
 |         "fsfg"
+| <#selection-focus>
 
 After:

trunk/LayoutTests/editing/inserting/insert-list-in-table-cell-07-expected.txt

@@ -17 +17 @@
 |         "fsfg"
 |   <tbody>
+| <#selection-focus>
 
 After:

trunk/LayoutTests/editing/inserting/insert-list-in-table-cell-08-expected.txt

@@ -2 +2 @@
 
 Before:
+| <#selection-anchor>
 | <table>
 |   border="1"
@@ -16 +17 @@
 |       <td>
 |         "fsfg"
+| <#selection-focus>
 
 After:
+| <#selection-anchor>
 | <table>
 |   border="1"

trunk/LayoutTests/editing/inserting/insert-table-in-paragraph-crash-expected.txt

@@ -1 +1 @@
 This tests pasting a table element wrapped in p. WebKit should not crash.
+| <#selection-caret>
 | <table>
 |   <tbody>

trunk/LayoutTests/editing/pasteboard/copy-null-characters-expected.txt

@@ -33 +33 @@
 | "
 "
+| <#selection-caret>
 | <textarea>
 |   id="destination-plain-text"

trunk/LayoutTests/editing/pasteboard/copy-paste-content-starting-and-ending-canvas-expected.txt

@@ -5 +5 @@
 | "
 "
+| <#selection-anchor>
 | <canvas>
 |   height="100"
@@ -23 +24 @@
 |   style="border: 1px solid black"
 |   width="100"
+| <#selection-focus>
 | "
 "
@@ -45 +47 @@
 |   style="border: 1px solid black;"
 |   width="100"
+| <#selection-caret>
 | <br>

trunk/LayoutTests/editing/pasteboard/paste-blockquote-and-paragraph-break-expected.txt

@@ -5 +5 @@
 
 Before paste:
+| <#selection-caret>
 | <br>
 | <blockquote>

trunk/LayoutTests/editing/pasteboard/paste-table-with-unrendered-text-nodes-expected.txt

@@ -3 +3 @@
 | "line 1"
 | <br>
+| <#selection-caret>
 | <br>
 
@@ -26 +27 @@
 |   "
 "
+| <#selection-caret>
 
 After typing ling 3:
@@ -94 +96 @@
 |   "
 "
+| <#selection-caret>
 
 After typing ling 5:

trunk/LayoutTests/editing/pasteboard/pasting-into-h6-should-not-nest-h6-expected.txt

@@ -26 +26 @@
 |   "Blue Line 1"
 |   <br>
+| <#selection-caret>
 | <h6>
 |   "Black Line"

trunk/LayoutTests/editing/pasteboard/pasting-into-p-should-not-nest-p-expected.txt

@@ -50 +50 @@
 |     id="source"
 |     "Copy this line"
+| <#selection-caret>
 | <div>
 |   <span>

trunk/LayoutTests/editing/style/apply-style-atomic-expected.txt

@@ -18 +18 @@
 |           style="width: -100%;"
 |           shadow:pseudoId="-webkit-progress-value"
+| <#selection-focus>

trunk/LayoutTests/fast/events/5056619-expected.txt

@@ -11 +11 @@
 |   id="span"
 |   "Dragme"
+| <#selection-caret>
 | "
 "

trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-1-expected.txt

@@ -59 +59 @@
 
 Dump of markup 15:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-2-expected.txt

@@ -43 +43 @@
 
 Dump of markup 11:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-3-expected.txt

@@ -43 +43 @@
 
 Dump of markup 11:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-4-expected.txt

@@ -43 +43 @@
 
 Dump of markup 11:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-5-expected.txt

@@ -47 +47 @@
 
 Dump of markup 12:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-6-expected.txt

@@ -39 +39 @@
 
 Dump of markup 10:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-7-expected.txt

@@ -47 +47 @@
 
 Dump of markup 12:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-8-expected.txt

@@ -47 +47 @@
 
 Dump of markup 12:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-9-expected.txt

@@ -59 +59 @@
 
 Dump of markup 15:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-expected.txt

@@ -43 +43 @@
 
 Dump of markup 11:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-1-expected.txt

@@ -59 +59 @@
 
 Dump of markup 15:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-2-expected.txt

@@ -43 +43 @@
 
 Dump of markup 11:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-3-expected.txt

@@ -43 +43 @@
 
 Dump of markup 11:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-4-expected.txt

@@ -43 +43 @@
 
 Dump of markup 11:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-5-expected.txt

@@ -47 +47 @@
 
 Dump of markup 12:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-6-expected.txt

@@ -39 +39 @@
 
 Dump of markup 10:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-7-expected.txt

@@ -47 +47 @@
 
 Dump of markup 12:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-8-expected.txt

@@ -47 +47 @@
 
 Dump of markup 12:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-9-expected.txt

@@ -143 +143 @@
 
 Dump of markup 36:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-1-expected.txt

@@ -59 +59 @@
 
 Dump of markup 15:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-2-expected.txt

@@ -43 +43 @@
 
 Dump of markup 11:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-3-expected.txt

@@ -43 +43 @@
 
 Dump of markup 11:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-4-expected.txt

@@ -43 +43 @@
 
 Dump of markup 11:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-5-expected.txt

@@ -47 +47 @@
 
 Dump of markup 12:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-6-expected.txt

@@ -39 +39 @@
 
 Dump of markup 10:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-7-expected.txt

@@ -47 +47 @@
 
 Dump of markup 12:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-8-expected.txt

@@ -47 +47 @@
 
 Dump of markup 12:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-9-expected.txt

@@ -59 +59 @@
 
 Dump of markup 15:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-expected.txt

@@ -43 +43 @@
 
 Dump of markup 11:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-1-expected.txt

@@ -115 +115 @@
 
 Dump of markup 29:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-2-expected.txt

@@ -107 +107 @@
 
 Dump of markup 27:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-3-expected.txt

@@ -115 +115 @@
 
 Dump of markup 29:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-4-expected.txt

@@ -115 +115 @@
 
 Dump of markup 29:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-5-expected.txt

@@ -107 +107 @@
 
 Dump of markup 27:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-6-expected.txt

@@ -99 +99 @@
 
 Dump of markup 25:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-7-expected.txt

@@ -107 +107 @@
 
 Dump of markup 27:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-8-expected.txt

@@ -103 +103 @@
 
 Dump of markup 26:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-9-expected.txt

@@ -159 +159 @@
 
 Dump of markup 40:
+| <#selection-caret>
 | <br>

trunk/LayoutTests/resources/dump-as-markup.js

@@ -136 +136 @@
 
     // Don't print any markup for the root node.
-    for (var i = 0, len = node.childNodes.length; i < len; i++)
+
+    var len = node.childNodes.length;
+    var i = 0;
+    for (; i < len; i++) {
+        markup += Markup._getSelectionMarkerWithIdentation(node, i, 0);
         markup += Markup._get(node.childNodes[i], 0, shadowRootList);
+    }
+    markup += Markup._getSelectionMarkerWithIdentation(node, len, 0);
+
     return markup.substring(1);
 }
@@ -234 +241 @@
 
     for (var i = 0, len = node.childNodes.length; i < len; i++) {
-        var selection = Markup._getSelectionMarker(node, i);
-        if (selection)
-            str += Markup._indent(depth + 1) + selection;
-
+        str += Markup._getSelectionMarkerWithIdentation(node, i, depth + 1);
         str += Markup._get(node.childNodes[i], depth + 1, shadowRootList);
     }
     
     str += Markup._getShadowHostIfPossible(node, depth, shadowRootList);
-    
-    var selection = Markup._getSelectionMarker(node, i);
-    if (selection)
-        str += Markup._indent(depth + 1) + selection;
+    str += Markup._getSelectionMarkerWithIdentation(node, i, depth + 1);
 
     return str;
@@ -347 +348 @@
 }
 
+Markup._getSelectionMarkerWithIdentation = function(node, index, depth)
+{
+    var selection = Markup._getSelectionMarker(node, index);
+    if (!selection)
+        return selection;
+    return Markup._indent(depth) + selection;
+}
+
 Markup._getSelectionMarker = function(node, index)
 {