Attachment 340067 Details for Bug 185497 – Improves Markup.dump

[patch] Improves Markup.dump

bug-185497-20180509214103.patch (text/plain), 37.92 KB, created by Ryosuke Niwa on 2018-05-09 21:41:03 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ryosuke Niwa

Created: 2018-05-09 21:41:03 PDT

Size: 37.92 KB

patch

obsolete

>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 231629)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,82 @@
>+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 NOBODY (OOPS!).
>+
>+        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>
> 
>         AX: VoiceOver iframe scrolling focus jumping bug
>Index: LayoutTests/editing/deleting/delete-across-editable-content-boundaries-1-expected.txt
>===================================================================
>--- LayoutTests/editing/deleting/delete-across-editable-content-boundaries-1-expected.txt	(revision 231604)
>+++ LayoutTests/editing/deleting/delete-across-editable-content-boundaries-1-expected.txt	(working copy)
>@@ -1,2 +1,3 @@
> 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>
>Index: LayoutTests/editing/deleting/delete-image-followed-by-two-br-expected.txt
>===================================================================
>--- LayoutTests/editing/deleting/delete-image-followed-by-two-br-expected.txt	(revision 231604)
>+++ LayoutTests/editing/deleting/delete-image-followed-by-two-br-expected.txt	(working copy)
>@@ -1,4 +1,5 @@
> We should be able to delete the br and then the image.
>+| <#selection-caret>
> | <br>
> | "This is a line of text.
> "
>Index: LayoutTests/editing/deleting/delete-start-block-expected.txt
>===================================================================
>--- LayoutTests/editing/deleting/delete-start-block-expected.txt	(revision 231604)
>+++ LayoutTests/editing/deleting/delete-start-block-expected.txt	(working copy)
>@@ -1,5 +1,6 @@
> This tests removing the start block. WebKit should not crash.
> | <div>
> |   <br>
>+| <#selection-caret>
> | <br>
> | <br>
>Index: LayoutTests/editing/deleting/delete-word-from-unstyled-div-expected.txt
>===================================================================
>--- LayoutTests/editing/deleting/delete-word-from-unstyled-div-expected.txt	(revision 231604)
>+++ LayoutTests/editing/deleting/delete-word-from-unstyled-div-expected.txt	(working copy)
>@@ -1,4 +1,5 @@
> This test that the deletion of the last row of an unstyled DIV leaves a BR element and that the selection is where the BR element is.
> | "one"
> | <br>
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/editing/deleting/deleting-relative-positioned-special-element-expected.txt
>===================================================================
>--- LayoutTests/editing/deleting/deleting-relative-positioned-special-element-expected.txt	(revision 231604)
>+++ LayoutTests/editing/deleting/deleting-relative-positioned-special-element-expected.txt	(working copy)
>@@ -14,6 +14,7 @@ BeforeDeletion:
> AfterDeletion:
> | <p>
> |   "1"
>+| <#selection-caret>
> | <br>
> | <p>
> |   "3"
>Index: LayoutTests/editing/deleting/smart-delete-across-editable-boundaries-2-expected.txt
>===================================================================
>--- LayoutTests/editing/deleting/smart-delete-across-editable-boundaries-2-expected.txt	(revision 231604)
>+++ LayoutTests/editing/deleting/smart-delete-across-editable-boundaries-2-expected.txt	(working copy)
>@@ -1,4 +1,5 @@
> 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"
> |   " bar"
>Index: LayoutTests/editing/deleting/smart-delete-across-editable-boundaries-expected.txt
>===================================================================
>--- LayoutTests/editing/deleting/smart-delete-across-editable-boundaries-expected.txt	(revision 231604)
>+++ LayoutTests/editing/deleting/smart-delete-across-editable-boundaries-expected.txt	(working copy)
>@@ -1,4 +1,5 @@
> 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"
> |   " bar"
>Index: LayoutTests/editing/execCommand/break-non-editable-blockquote-expected.txt
>===================================================================
>--- LayoutTests/editing/execCommand/break-non-editable-blockquote-expected.txt	(revision 231604)
>+++ LayoutTests/editing/execCommand/break-non-editable-blockquote-expected.txt	(working copy)
>@@ -2,6 +2,7 @@ This test ensures WebKit properly insert
> | <blockquote>
> |   type="cite"
> |   "hello"
>+| <#selection-caret>
> | <br>
> | <blockquote>
> |   type="cite"
>Index: LayoutTests/editing/execCommand/format-block-table-expected.txt
>===================================================================
>--- LayoutTests/editing/execCommand/format-block-table-expected.txt	(revision 231604)
>+++ LayoutTests/editing/execCommand/format-block-table-expected.txt	(working copy)
>@@ -2,6 +2,7 @@
> Formatting:
> | "
> "
>+| <#selection-anchor>
> | <table>
> |   <tbody>
> |     <tr>
>@@ -9,6 +10,7 @@ Formatting:
> |         "hello"
> |       <td>
> |         "world"
>+| <#selection-focus>
> | "
> "
> 
>Index: LayoutTests/editing/execCommand/indent-img-twice-expected.txt
>===================================================================
>--- LayoutTests/editing/execCommand/indent-img-twice-expected.txt	(revision 231604)
>+++ LayoutTests/editing/execCommand/indent-img-twice-expected.txt	(working copy)
>@@ -1,8 +1,10 @@
> Test indenting an image element twice.
> 
> Initial state:
>+| <#selection-anchor>
> | <img>
> |   src="../resources/abe.png"
>+| <#selection-focus>
> 
> After indenting once:
> | <blockquote>
>Index: LayoutTests/editing/execCommand/remove-format-textdecoration-in-iframe-expected.txt
>===================================================================
>--- LayoutTests/editing/execCommand/remove-format-textdecoration-in-iframe-expected.txt	(revision 231604)
>+++ LayoutTests/editing/execCommand/remove-format-textdecoration-in-iframe-expected.txt	(working copy)
>@@ -3,6 +3,7 @@ This testcase is to test crash scenario 
>         "
> | <iframe>
> |   onload="selectAndRemoveFormat()"
>+| <#selection-focus>
> | "
>         "
> | <p>
>Index: LayoutTests/editing/inserting/5607069-2-expected.txt
>===================================================================
>--- LayoutTests/editing/inserting/5607069-2-expected.txt	(revision 231604)
>+++ LayoutTests/editing/inserting/5607069-2-expected.txt	(working copy)
>@@ -6,6 +6,7 @@ This tests for a bug where InsertLineBre
> |     <div>
> |       contenteditable="plaintext-only"
> | <br>
>+| <#selection-caret>
> | <input>
> |   type="text"
> |   this.value=""
>Index: LayoutTests/editing/inserting/5994480-2-expected.txt
>===================================================================
>--- LayoutTests/editing/inserting/5994480-2-expected.txt	(revision 231604)
>+++ LayoutTests/editing/inserting/5994480-2-expected.txt	(working copy)
>@@ -1,3 +1,4 @@
> 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>
>Index: LayoutTests/editing/inserting/insert-list-in-table-cell-03-expected.txt
>===================================================================
>--- LayoutTests/editing/inserting/insert-list-in-table-cell-03-expected.txt	(revision 231604)
>+++ LayoutTests/editing/inserting/insert-list-in-table-cell-03-expected.txt	(working copy)
>@@ -15,6 +15,7 @@ Before:
> |         "gghfg"
> |       <td>
> |         "fsfg"
>+| <#selection-focus>
> 
> After:
> | <table>
>Index: LayoutTests/editing/inserting/insert-list-in-table-cell-04-expected.txt
>===================================================================
>--- LayoutTests/editing/inserting/insert-list-in-table-cell-04-expected.txt	(revision 231604)
>+++ LayoutTests/editing/inserting/insert-list-in-table-cell-04-expected.txt	(working copy)
>@@ -1,6 +1,7 @@
> Insert a list item in a table:
> 
> Before:
>+| <#selection-anchor>
> | <table>
> |   border="1"
> |   id="element"
>@@ -15,6 +16,7 @@ Before:
> |         "gghfg"
> |       <td>
> |         "fsfg"
>+| <#selection-focus>
> 
> After:
> | <ol>
>Index: LayoutTests/editing/inserting/insert-list-in-table-cell-07-expected.txt
>===================================================================
>--- LayoutTests/editing/inserting/insert-list-in-table-cell-07-expected.txt	(revision 231604)
>+++ LayoutTests/editing/inserting/insert-list-in-table-cell-07-expected.txt	(working copy)
>@@ -16,6 +16,7 @@ Before:
> |       <td>
> |         "fsfg"
> |   <tbody>
>+| <#selection-focus>
> 
> After:
> | <table>
>Index: LayoutTests/editing/inserting/insert-list-in-table-cell-08-expected.txt
>===================================================================
>--- LayoutTests/editing/inserting/insert-list-in-table-cell-08-expected.txt	(revision 231604)
>+++ LayoutTests/editing/inserting/insert-list-in-table-cell-08-expected.txt	(working copy)
>@@ -1,6 +1,7 @@
> Exec insertOrderedList twice in a table removes the previously inserted list item:
> 
> Before:
>+| <#selection-anchor>
> | <table>
> |   border="1"
> |   id="element"
>@@ -15,8 +16,10 @@ Before:
> |         "gghfg"
> |       <td>
> |         "fsfg"
>+| <#selection-focus>
> 
> After:
>+| <#selection-anchor>
> | <table>
> |   border="1"
> |   id="element"
>Index: LayoutTests/editing/inserting/insert-table-in-paragraph-crash-expected.txt
>===================================================================
>--- LayoutTests/editing/inserting/insert-table-in-paragraph-crash-expected.txt	(revision 231604)
>+++ LayoutTests/editing/inserting/insert-table-in-paragraph-crash-expected.txt	(working copy)
>@@ -1,4 +1,5 @@
> This tests pasting a table element wrapped in p. WebKit should not crash.
>+| <#selection-caret>
> | <table>
> |   <tbody>
> |     <tr>
>Index: LayoutTests/editing/pasteboard/copy-null-characters-expected.txt
>===================================================================
>--- LayoutTests/editing/pasteboard/copy-null-characters-expected.txt	(revision 231604)
>+++ LayoutTests/editing/pasteboard/copy-null-characters-expected.txt	(working copy)
>@@ -32,6 +32,7 @@ If there are NULL characters in text nod
> |   "Copy paste me"
> | "
> "
>+| <#selection-caret>
> | <textarea>
> |   id="destination-plain-text"
> |   this.value="Copy paste mebold
>Index: LayoutTests/editing/pasteboard/copy-paste-content-starting-and-ending-canvas-expected.txt
>===================================================================
>--- LayoutTests/editing/pasteboard/copy-paste-content-starting-and-ending-canvas-expected.txt	(revision 231604)
>+++ LayoutTests/editing/pasteboard/copy-paste-content-starting-and-ending-canvas-expected.txt	(working copy)
>@@ -4,6 +4,7 @@ To manually test, copy and paste the con
> Before paste:
> | "
> "
>+| <#selection-anchor>
> | <canvas>
> |   height="100"
> |   style="border: 1px solid black"
>@@ -22,6 +23,7 @@ some more text
> |   height="100"
> |   style="border: 1px solid black"
> |   width="100"
>+| <#selection-focus>
> | "
> "
> 
>@@ -44,4 +46,5 @@ After paste:
> |   height="100"
> |   style="border: 1px solid black;"
> |   width="100"
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/editing/pasteboard/paste-blockquote-and-paragraph-break-expected.txt
>===================================================================
>--- LayoutTests/editing/pasteboard/paste-blockquote-and-paragraph-break-expected.txt	(revision 231604)
>+++ LayoutTests/editing/pasteboard/paste-blockquote-and-paragraph-break-expected.txt	(working copy)
>@@ -4,6 +4,7 @@ You should see 'hello' (blockquoted), 'w
> See <rdar://problem/5368833<
> 
> Before paste:
>+| <#selection-caret>
> | <br>
> | <blockquote>
> |   id="blockquote"
>Index: LayoutTests/editing/pasteboard/paste-table-with-unrendered-text-nodes-expected.txt
>===================================================================
>--- LayoutTests/editing/pasteboard/paste-table-with-unrendered-text-nodes-expected.txt	(revision 231604)
>+++ LayoutTests/editing/pasteboard/paste-table-with-unrendered-text-nodes-expected.txt	(working copy)
>@@ -2,6 +2,7 @@
> Initial state:
> | "line 1"
> | <br>
>+| <#selection-caret>
> | <br>
> 
> After pasting line 2 (table A):
>@@ -25,6 +26,7 @@ After pasting line 2 (table A):
> "
> |   "
> "
>+| <#selection-caret>
> 
> After typing ling 3:
> | "line 1"
>@@ -93,6 +95,7 @@ After pasting ling 4 (table B):
> "
> |   "
> "
>+| <#selection-caret>
> 
> After typing ling 5:
> | "line 1"
>Index: LayoutTests/editing/pasteboard/pasting-into-h6-should-not-nest-h6-expected.txt
>===================================================================
>--- LayoutTests/editing/pasteboard/pasting-into-h6-should-not-nest-h6-expected.txt	(revision 231604)
>+++ LayoutTests/editing/pasteboard/pasting-into-h6-should-not-nest-h6-expected.txt	(working copy)
>@@ -25,6 +25,7 @@ After innerHTML = innerHTML:
> |   style="color: blue"
> |   "Blue Line 1"
> |   <br>
>+| <#selection-caret>
> | <h6>
> |   "Black Line"
> | <h6>
>Index: LayoutTests/editing/pasteboard/pasting-into-p-should-not-nest-p-expected.txt
>===================================================================
>--- LayoutTests/editing/pasteboard/pasting-into-p-should-not-nest-p-expected.txt	(revision 231604)
>+++ LayoutTests/editing/pasteboard/pasting-into-p-should-not-nest-p-expected.txt	(working copy)
>@@ -49,6 +49,7 @@ After innerHTML = innerHTML:
> |   <span>
> |     id="source"
> |     "Copy this line"
>+| <#selection-caret>
> | <div>
> |   <span>
> |     <br>
>Index: LayoutTests/editing/style/apply-style-atomic-expected.txt
>===================================================================
>--- LayoutTests/editing/style/apply-style-atomic-expected.txt	(revision 231604)
>+++ LayoutTests/editing/style/apply-style-atomic-expected.txt	(working copy)
>@@ -17,3 +17,4 @@ Test that WebKit does not crash when we 
> |           pseudo="-webkit-progress-value"
> |           style="width: -100%;"
> |           shadow:pseudoId="-webkit-progress-value"
>+| <#selection-focus>
>Index: LayoutTests/fast/events/5056619-expected.txt
>===================================================================
>--- LayoutTests/fast/events/5056619-expected.txt	(revision 231604)
>+++ LayoutTests/fast/events/5056619-expected.txt	(working copy)
>@@ -10,6 +10,7 @@ This tests drag and drop into a form ele
> | <span>
> |   id="span"
> |   "Dragme"
>+| <#selection-caret>
> | "
> "
> | <script>
>Index: LayoutTests/platform/ios/editing/deleting/delete-emoji-1-expected.txt
>===================================================================
>--- LayoutTests/platform/ios/editing/deleting/delete-emoji-1-expected.txt	(revision 231604)
>+++ LayoutTests/platform/ios/editing/deleting/delete-emoji-1-expected.txt	(working copy)
>@@ -58,4 +58,5 @@ Dump of markup 14:
> ðâð¨<#selection-caret>"
> 
> Dump of markup 15:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/ios/editing/deleting/delete-emoji-2-expected.txt
>===================================================================
>--- LayoutTests/platform/ios/editing/deleting/delete-emoji-2-expected.txt	(revision 231604)
>+++ LayoutTests/platform/ios/editing/deleting/delete-emoji-2-expected.txt	(working copy)
>@@ -42,4 +42,5 @@ Dump of markup 10:
> ð¨âð§âð§<#selection-caret>"
> 
> Dump of markup 11:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/ios/editing/deleting/delete-emoji-3-expected.txt
>===================================================================
>--- LayoutTests/platform/ios/editing/deleting/delete-emoji-3-expected.txt	(revision 231604)
>+++ LayoutTests/platform/ios/editing/deleting/delete-emoji-3-expected.txt	(working copy)
>@@ -42,4 +42,5 @@ Dump of markup 10:
> ðð»ââï¸<#selection-caret>"
> 
> Dump of markup 11:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/ios/editing/deleting/delete-emoji-4-expected.txt
>===================================================================
>--- LayoutTests/platform/ios/editing/deleting/delete-emoji-4-expected.txt	(revision 231604)
>+++ LayoutTests/platform/ios/editing/deleting/delete-emoji-4-expected.txt	(working copy)
>@@ -42,4 +42,5 @@ Dump of markup 10:
> ðð½ââï¸<#selection-caret>"
> 
> Dump of markup 11:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/ios/editing/deleting/delete-emoji-5-expected.txt
>===================================================================
>--- LayoutTests/platform/ios/editing/deleting/delete-emoji-5-expected.txt	(revision 231604)
>+++ LayoutTests/platform/ios/editing/deleting/delete-emoji-5-expected.txt	(working copy)
>@@ -46,4 +46,5 @@ Dump of markup 11:
> ðð¿ââï¸<#selection-caret>"
> 
> Dump of markup 12:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/ios/editing/deleting/delete-emoji-6-expected.txt
>===================================================================
>--- LayoutTests/platform/ios/editing/deleting/delete-emoji-6-expected.txt	(revision 231604)
>+++ LayoutTests/platform/ios/editing/deleting/delete-emoji-6-expected.txt	(working copy)
>@@ -38,4 +38,5 @@ Dump of markup 9:
> ðð»ââ<#selection-caret>"
> 
> Dump of markup 10:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/ios/editing/deleting/delete-emoji-7-expected.txt
>===================================================================
>--- LayoutTests/platform/ios/editing/deleting/delete-emoji-7-expected.txt	(revision 231604)
>+++ LayoutTests/platform/ios/editing/deleting/delete-emoji-7-expected.txt	(working copy)
>@@ -46,4 +46,5 @@ Dump of markup 11:
> ðð»<#selection-caret>"
> 
> Dump of markup 12:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/ios/editing/deleting/delete-emoji-8-expected.txt
>===================================================================
>--- LayoutTests/platform/ios/editing/deleting/delete-emoji-8-expected.txt	(revision 231604)
>+++ LayoutTests/platform/ios/editing/deleting/delete-emoji-8-expected.txt	(working copy)
>@@ -46,4 +46,5 @@ Dump of markup 11:
> ð¤·<#selection-caret>"
> 
> Dump of markup 12:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/ios/editing/deleting/delete-emoji-9-expected.txt
>===================================================================
>--- LayoutTests/platform/ios/editing/deleting/delete-emoji-9-expected.txt	(revision 231604)
>+++ LayoutTests/platform/ios/editing/deleting/delete-emoji-9-expected.txt	(working copy)
>@@ -58,4 +58,5 @@ Dump of markup 14:
> ð¤ð»<#selection-caret>"
> 
> Dump of markup 15:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/ios/editing/deleting/delete-emoji-expected.txt
>===================================================================
>--- LayoutTests/platform/ios/editing/deleting/delete-emoji-expected.txt	(revision 231604)
>+++ LayoutTests/platform/ios/editing/deleting/delete-emoji-expected.txt	(working copy)
>@@ -42,4 +42,5 @@ Dump of markup 10:
> ð¦ð»<#selection-caret>"
> 
> Dump of markup 11:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-1-expected.txt
>===================================================================
>--- LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-1-expected.txt	(revision 231604)
>+++ LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-1-expected.txt	(working copy)
>@@ -58,4 +58,5 @@ Dump of markup 14:
> ðâð¨<#selection-caret>"
> 
> Dump of markup 15:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-2-expected.txt
>===================================================================
>--- LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-2-expected.txt	(revision 231604)
>+++ LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-2-expected.txt	(working copy)
>@@ -42,4 +42,5 @@ Dump of markup 10:
> ð¨âð§âð§<#selection-caret>"
> 
> Dump of markup 11:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-3-expected.txt
>===================================================================
>--- LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-3-expected.txt	(revision 231604)
>+++ LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-3-expected.txt	(working copy)
>@@ -42,4 +42,5 @@ Dump of markup 10:
> ðð»ââï¸<#selection-caret>"
> 
> Dump of markup 11:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-4-expected.txt
>===================================================================
>--- LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-4-expected.txt	(revision 231604)
>+++ LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-4-expected.txt	(working copy)
>@@ -42,4 +42,5 @@ Dump of markup 10:
> ðð½ââï¸<#selection-caret>"
> 
> Dump of markup 11:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-5-expected.txt
>===================================================================
>--- LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-5-expected.txt	(revision 231604)
>+++ LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-5-expected.txt	(working copy)
>@@ -46,4 +46,5 @@ Dump of markup 11:
> ðð¿ââï¸<#selection-caret>"
> 
> Dump of markup 12:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-6-expected.txt
>===================================================================
>--- LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-6-expected.txt	(revision 231604)
>+++ LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-6-expected.txt	(working copy)
>@@ -38,4 +38,5 @@ Dump of markup 9:
> ðð»ââ<#selection-caret>"
> 
> Dump of markup 10:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-7-expected.txt
>===================================================================
>--- LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-7-expected.txt	(revision 231604)
>+++ LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-7-expected.txt	(working copy)
>@@ -46,4 +46,5 @@ Dump of markup 11:
> ðð»<#selection-caret>"
> 
> Dump of markup 12:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-8-expected.txt
>===================================================================
>--- LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-8-expected.txt	(revision 231604)
>+++ LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-8-expected.txt	(working copy)
>@@ -46,4 +46,5 @@ Dump of markup 11:
> ð¤·<#selection-caret>"
> 
> Dump of markup 12:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-9-expected.txt
>===================================================================
>--- LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-9-expected.txt	(revision 231604)
>+++ LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-9-expected.txt	(working copy)
>@@ -142,4 +142,5 @@ Dump of markup 35:
> ð¤ð»<#selection-caret>"
> 
> Dump of markup 36:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/mac/editing/deleting/delete-emoji-1-expected.txt
>===================================================================
>--- LayoutTests/platform/mac/editing/deleting/delete-emoji-1-expected.txt	(revision 231604)
>+++ LayoutTests/platform/mac/editing/deleting/delete-emoji-1-expected.txt	(working copy)
>@@ -58,4 +58,5 @@ Dump of markup 14:
> ðâð¨<#selection-caret>"
> 
> Dump of markup 15:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/mac/editing/deleting/delete-emoji-2-expected.txt
>===================================================================
>--- LayoutTests/platform/mac/editing/deleting/delete-emoji-2-expected.txt	(revision 231604)
>+++ LayoutTests/platform/mac/editing/deleting/delete-emoji-2-expected.txt	(working copy)
>@@ -42,4 +42,5 @@ Dump of markup 10:
> ð¨âð§âð§<#selection-caret>"
> 
> Dump of markup 11:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/mac/editing/deleting/delete-emoji-3-expected.txt
>===================================================================
>--- LayoutTests/platform/mac/editing/deleting/delete-emoji-3-expected.txt	(revision 231604)
>+++ LayoutTests/platform/mac/editing/deleting/delete-emoji-3-expected.txt	(working copy)
>@@ -42,4 +42,5 @@ Dump of markup 10:
> ðð»ââï¸<#selection-caret>"
> 
> Dump of markup 11:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/mac/editing/deleting/delete-emoji-4-expected.txt
>===================================================================
>--- LayoutTests/platform/mac/editing/deleting/delete-emoji-4-expected.txt	(revision 231604)
>+++ LayoutTests/platform/mac/editing/deleting/delete-emoji-4-expected.txt	(working copy)
>@@ -42,4 +42,5 @@ Dump of markup 10:
> ðð½ââï¸<#selection-caret>"
> 
> Dump of markup 11:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/mac/editing/deleting/delete-emoji-5-expected.txt
>===================================================================
>--- LayoutTests/platform/mac/editing/deleting/delete-emoji-5-expected.txt	(revision 231604)
>+++ LayoutTests/platform/mac/editing/deleting/delete-emoji-5-expected.txt	(working copy)
>@@ -46,4 +46,5 @@ Dump of markup 11:
> ðð¿ââï¸<#selection-caret>"
> 
> Dump of markup 12:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/mac/editing/deleting/delete-emoji-6-expected.txt
>===================================================================
>--- LayoutTests/platform/mac/editing/deleting/delete-emoji-6-expected.txt	(revision 231604)
>+++ LayoutTests/platform/mac/editing/deleting/delete-emoji-6-expected.txt	(working copy)
>@@ -38,4 +38,5 @@ Dump of markup 9:
> ðð»ââ<#selection-caret>"
> 
> Dump of markup 10:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/mac/editing/deleting/delete-emoji-7-expected.txt
>===================================================================
>--- LayoutTests/platform/mac/editing/deleting/delete-emoji-7-expected.txt	(revision 231604)
>+++ LayoutTests/platform/mac/editing/deleting/delete-emoji-7-expected.txt	(working copy)
>@@ -46,4 +46,5 @@ Dump of markup 11:
> ðð»<#selection-caret>"
> 
> Dump of markup 12:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/mac/editing/deleting/delete-emoji-8-expected.txt
>===================================================================
>--- LayoutTests/platform/mac/editing/deleting/delete-emoji-8-expected.txt	(revision 231604)
>+++ LayoutTests/platform/mac/editing/deleting/delete-emoji-8-expected.txt	(working copy)
>@@ -46,4 +46,5 @@ Dump of markup 11:
> ð¤·<#selection-caret>"
> 
> Dump of markup 12:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/mac/editing/deleting/delete-emoji-9-expected.txt
>===================================================================
>--- LayoutTests/platform/mac/editing/deleting/delete-emoji-9-expected.txt	(revision 231604)
>+++ LayoutTests/platform/mac/editing/deleting/delete-emoji-9-expected.txt	(working copy)
>@@ -58,4 +58,5 @@ Dump of markup 14:
> ð¤ð»<#selection-caret>"
> 
> Dump of markup 15:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/mac/editing/deleting/delete-emoji-expected.txt
>===================================================================
>--- LayoutTests/platform/mac/editing/deleting/delete-emoji-expected.txt	(revision 231604)
>+++ LayoutTests/platform/mac/editing/deleting/delete-emoji-expected.txt	(working copy)
>@@ -42,4 +42,5 @@ Dump of markup 10:
> ð¦ð»<#selection-caret>"
> 
> Dump of markup 11:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/wincairo/editing/deleting/delete-emoji-1-expected.txt
>===================================================================
>--- LayoutTests/platform/wincairo/editing/deleting/delete-emoji-1-expected.txt	(revision 231604)
>+++ LayoutTests/platform/wincairo/editing/deleting/delete-emoji-1-expected.txt	(working copy)
>@@ -114,4 +114,5 @@ Dump of markup 28:
> ðâ<#selection-caret>"
> 
> Dump of markup 29:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/wincairo/editing/deleting/delete-emoji-2-expected.txt
>===================================================================
>--- LayoutTests/platform/wincairo/editing/deleting/delete-emoji-2-expected.txt	(revision 231604)
>+++ LayoutTests/platform/wincairo/editing/deleting/delete-emoji-2-expected.txt	(working copy)
>@@ -106,4 +106,5 @@ Dump of markup 26:
> ð¨â<#selection-caret>"
> 
> Dump of markup 27:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/wincairo/editing/deleting/delete-emoji-3-expected.txt
>===================================================================
>--- LayoutTests/platform/wincairo/editing/deleting/delete-emoji-3-expected.txt	(revision 231604)
>+++ LayoutTests/platform/wincairo/editing/deleting/delete-emoji-3-expected.txt	(working copy)
>@@ -114,4 +114,5 @@ Dump of markup 28:
> ð<#selection-caret>"
> 
> Dump of markup 29:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/wincairo/editing/deleting/delete-emoji-4-expected.txt
>===================================================================
>--- LayoutTests/platform/wincairo/editing/deleting/delete-emoji-4-expected.txt	(revision 231604)
>+++ LayoutTests/platform/wincairo/editing/deleting/delete-emoji-4-expected.txt	(working copy)
>@@ -114,4 +114,5 @@ Dump of markup 28:
> ð<#selection-caret>"
> 
> Dump of markup 29:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/wincairo/editing/deleting/delete-emoji-5-expected.txt
>===================================================================
>--- LayoutTests/platform/wincairo/editing/deleting/delete-emoji-5-expected.txt	(revision 231604)
>+++ LayoutTests/platform/wincairo/editing/deleting/delete-emoji-5-expected.txt	(working copy)
>@@ -106,4 +106,5 @@ Dump of markup 26:
> ð<#selection-caret>"
> 
> Dump of markup 27:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/wincairo/editing/deleting/delete-emoji-6-expected.txt
>===================================================================
>--- LayoutTests/platform/wincairo/editing/deleting/delete-emoji-6-expected.txt	(revision 231604)
>+++ LayoutTests/platform/wincairo/editing/deleting/delete-emoji-6-expected.txt	(working copy)
>@@ -98,4 +98,5 @@ Dump of markup 24:
> ð<#selection-caret>"
> 
> Dump of markup 25:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/wincairo/editing/deleting/delete-emoji-7-expected.txt
>===================================================================
>--- LayoutTests/platform/wincairo/editing/deleting/delete-emoji-7-expected.txt	(revision 231604)
>+++ LayoutTests/platform/wincairo/editing/deleting/delete-emoji-7-expected.txt	(working copy)
>@@ -106,4 +106,5 @@ Dump of markup 26:
> ð<#selection-caret>"
> 
> Dump of markup 27:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/wincairo/editing/deleting/delete-emoji-8-expected.txt
>===================================================================
>--- LayoutTests/platform/wincairo/editing/deleting/delete-emoji-8-expected.txt	(revision 231604)
>+++ LayoutTests/platform/wincairo/editing/deleting/delete-emoji-8-expected.txt	(working copy)
>@@ -102,4 +102,5 @@ Dump of markup 25:
> ð¤·<#selection-caret>"
> 
> Dump of markup 26:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/platform/wincairo/editing/deleting/delete-emoji-9-expected.txt
>===================================================================
>--- LayoutTests/platform/wincairo/editing/deleting/delete-emoji-9-expected.txt	(revision 231604)
>+++ LayoutTests/platform/wincairo/editing/deleting/delete-emoji-9-expected.txt	(working copy)
>@@ -158,4 +158,5 @@ Dump of markup 39:
> ð¤<#selection-caret>"
> 
> Dump of markup 40:
>+| <#selection-caret>
> | <br>
>Index: LayoutTests/resources/dump-as-markup.js
>===================================================================
>--- LayoutTests/resources/dump-as-markup.js	(revision 231604)
>+++ LayoutTests/resources/dump-as-markup.js	(working copy)
>@@ -135,8 +135,15 @@ Markup.get = function(node)
>         return '| ';
> 
>     // 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);
> }
> 
>@@ -233,18 +240,12 @@ Markup._get = function(node, depth, shad
>         str += Markup._get(node.content, depth + 1, shadowRootList);
> 
>     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;
> }
>@@ -346,6 +347,14 @@ Markup._getMarkupForTextNode = function(
>     return innerMarkup;
> }
> 
>+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)
> {
>     if (node.nodeType != 1)

Flags:

wenson_hsieh: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 185497: 340052 | 340055 | 340056 | 340059 | 340063 | 340067