Diff
Modified: trunk/LayoutTests/ChangeLog (231629 => 231630)
--- trunk/LayoutTests/ChangeLog 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/ChangeLog 2018-05-10 06:39:01 UTC (rev 231630)
@@ -1,3 +1,82 @@
+2018-05-09 Ryosuke Niwa <[email protected]>
+
+ 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 <[email protected]>
AX: VoiceOver iframe scrolling focus jumping bug
Modified: trunk/LayoutTests/editing/deleting/delete-across-editable-content-boundaries-1-expected.txt (231629 => 231630)
--- trunk/LayoutTests/editing/deleting/delete-across-editable-content-boundaries-1-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/editing/deleting/delete-across-editable-content-boundaries-1-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -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>
Modified: trunk/LayoutTests/editing/deleting/delete-image-followed-by-two-br-expected.txt (231629 => 231630)
--- trunk/LayoutTests/editing/deleting/delete-image-followed-by-two-br-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/editing/deleting/delete-image-followed-by-two-br-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -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.
"
Modified: trunk/LayoutTests/editing/deleting/delete-start-block-expected.txt (231629 => 231630)
--- trunk/LayoutTests/editing/deleting/delete-start-block-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/editing/deleting/delete-start-block-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -1,5 +1,6 @@
This tests removing the start block. WebKit should not crash.
| <div>
| <br>
+| <#selection-caret>
| <br>
| <br>
Modified: trunk/LayoutTests/editing/deleting/delete-word-from-unstyled-div-expected.txt (231629 => 231630)
--- trunk/LayoutTests/editing/deleting/delete-word-from-unstyled-div-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/editing/deleting/delete-word-from-unstyled-div-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -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>
Modified: trunk/LayoutTests/editing/deleting/deleting-relative-positioned-special-element-expected.txt (231629 => 231630)
--- trunk/LayoutTests/editing/deleting/deleting-relative-positioned-special-element-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/editing/deleting/deleting-relative-positioned-special-element-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -14,6 +14,7 @@
AfterDeletion:
| <p>
| "1"
+| <#selection-caret>
| <br>
| <p>
| "3"
Modified: trunk/LayoutTests/editing/deleting/smart-delete-across-editable-boundaries-2-expected.txt (231629 => 231630)
--- trunk/LayoutTests/editing/deleting/smart-delete-across-editable-boundaries-2-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/editing/deleting/smart-delete-across-editable-boundaries-2-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -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"
Modified: trunk/LayoutTests/editing/deleting/smart-delete-across-editable-boundaries-expected.txt (231629 => 231630)
--- trunk/LayoutTests/editing/deleting/smart-delete-across-editable-boundaries-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/editing/deleting/smart-delete-across-editable-boundaries-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -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"
Modified: trunk/LayoutTests/editing/execCommand/break-non-editable-blockquote-expected.txt (231629 => 231630)
--- trunk/LayoutTests/editing/execCommand/break-non-editable-blockquote-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/editing/execCommand/break-non-editable-blockquote-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -2,6 +2,7 @@
| <blockquote>
| type="cite"
| "hello"
+| <#selection-caret>
| <br>
| <blockquote>
| type="cite"
Modified: trunk/LayoutTests/editing/execCommand/format-block-table-expected.txt (231629 => 231630)
--- trunk/LayoutTests/editing/execCommand/format-block-table-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/editing/execCommand/format-block-table-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -2,6 +2,7 @@
Formatting:
| "
"
+| <#selection-anchor>
| <table>
| <tbody>
| <tr>
@@ -9,6 +10,7 @@
| "hello"
| <td>
| "world"
+| <#selection-focus>
| "
"
Modified: trunk/LayoutTests/editing/execCommand/indent-img-twice-expected.txt (231629 => 231630)
--- trunk/LayoutTests/editing/execCommand/indent-img-twice-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/editing/execCommand/indent-img-twice-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -1,8 +1,10 @@
Test indenting an image element twice.
Initial state:
+| <#selection-anchor>
| <img>
| src=""
+| <#selection-focus>
After indenting once:
| <blockquote>
Modified: trunk/LayoutTests/editing/execCommand/remove-format-textdecoration-in-iframe-expected.txt (231629 => 231630)
--- trunk/LayoutTests/editing/execCommand/remove-format-textdecoration-in-iframe-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/editing/execCommand/remove-format-textdecoration-in-iframe-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -3,6 +3,7 @@
"
| <iframe>
| _onload_="selectAndRemoveFormat()"
+| <#selection-focus>
| "
"
| <p>
Modified: trunk/LayoutTests/editing/inserting/5607069-2-expected.txt (231629 => 231630)
--- trunk/LayoutTests/editing/inserting/5607069-2-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/editing/inserting/5607069-2-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -6,6 +6,7 @@
| <div>
| contenteditable="plaintext-only"
| <br>
+| <#selection-caret>
| <input>
| type="text"
| this.value=""
Modified: trunk/LayoutTests/editing/inserting/5994480-2-expected.txt (231629 => 231630)
--- trunk/LayoutTests/editing/inserting/5994480-2-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/editing/inserting/5994480-2-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -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>
Modified: trunk/LayoutTests/editing/inserting/insert-list-in-table-cell-03-expected.txt (231629 => 231630)
--- trunk/LayoutTests/editing/inserting/insert-list-in-table-cell-03-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/editing/inserting/insert-list-in-table-cell-03-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -15,6 +15,7 @@
| "gghfg"
| <td>
| "fsfg"
+| <#selection-focus>
After:
| <table>
Modified: trunk/LayoutTests/editing/inserting/insert-list-in-table-cell-04-expected.txt (231629 => 231630)
--- trunk/LayoutTests/editing/inserting/insert-list-in-table-cell-04-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/editing/inserting/insert-list-in-table-cell-04-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -1,6 +1,7 @@
Insert a list item in a table:
Before:
+| <#selection-anchor>
| <table>
| border="1"
| id="element"
@@ -15,6 +16,7 @@
| "gghfg"
| <td>
| "fsfg"
+| <#selection-focus>
After:
| <ol>
Modified: trunk/LayoutTests/editing/inserting/insert-list-in-table-cell-07-expected.txt (231629 => 231630)
--- trunk/LayoutTests/editing/inserting/insert-list-in-table-cell-07-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/editing/inserting/insert-list-in-table-cell-07-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -16,6 +16,7 @@
| <td>
| "fsfg"
| <tbody>
+| <#selection-focus>
After:
| <table>
Modified: trunk/LayoutTests/editing/inserting/insert-list-in-table-cell-08-expected.txt (231629 => 231630)
--- trunk/LayoutTests/editing/inserting/insert-list-in-table-cell-08-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/editing/inserting/insert-list-in-table-cell-08-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -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 @@
| "gghfg"
| <td>
| "fsfg"
+| <#selection-focus>
After:
+| <#selection-anchor>
| <table>
| border="1"
| id="element"
Modified: trunk/LayoutTests/editing/inserting/insert-table-in-paragraph-crash-expected.txt (231629 => 231630)
--- trunk/LayoutTests/editing/inserting/insert-table-in-paragraph-crash-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/editing/inserting/insert-table-in-paragraph-crash-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -1,4 +1,5 @@
This tests pasting a table element wrapped in p. WebKit should not crash.
+| <#selection-caret>
| <table>
| <tbody>
| <tr>
Modified: trunk/LayoutTests/editing/pasteboard/copy-null-characters-expected.txt (231629 => 231630)
--- trunk/LayoutTests/editing/pasteboard/copy-null-characters-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/editing/pasteboard/copy-null-characters-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -32,6 +32,7 @@
| "Copy paste me"
| "
"
+| <#selection-caret>
| <textarea>
| id="destination-plain-text"
| this.value="Copy paste mebold
Modified: trunk/LayoutTests/editing/pasteboard/copy-paste-content-starting-and-ending-canvas-expected.txt (231629 => 231630)
--- trunk/LayoutTests/editing/pasteboard/copy-paste-content-starting-and-ending-canvas-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/editing/pasteboard/copy-paste-content-starting-and-ending-canvas-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -4,6 +4,7 @@
Before paste:
| "
"
+| <#selection-anchor>
| <canvas>
| height="100"
| style="border: 1px solid black"
@@ -22,6 +23,7 @@
| height="100"
| style="border: 1px solid black"
| width="100"
+| <#selection-focus>
| "
"
@@ -44,4 +46,5 @@
| height="100"
| style="border: 1px solid black;"
| width="100"
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/editing/pasteboard/paste-blockquote-and-paragraph-break-expected.txt (231629 => 231630)
--- trunk/LayoutTests/editing/pasteboard/paste-blockquote-and-paragraph-break-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/editing/pasteboard/paste-blockquote-and-paragraph-break-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -4,6 +4,7 @@
See <rdar://problem/5368833<
Before paste:
+| <#selection-caret>
| <br>
| <blockquote>
| id="blockquote"
Modified: trunk/LayoutTests/editing/pasteboard/paste-table-with-unrendered-text-nodes-expected.txt (231629 => 231630)
--- trunk/LayoutTests/editing/pasteboard/paste-table-with-unrendered-text-nodes-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/editing/pasteboard/paste-table-with-unrendered-text-nodes-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -2,6 +2,7 @@
Initial state:
| "line 1"
| <br>
+| <#selection-caret>
| <br>
After pasting line 2 (table A):
@@ -25,6 +26,7 @@
"
| "
"
+| <#selection-caret>
After typing ling 3:
| "line 1"
@@ -93,6 +95,7 @@
"
| "
"
+| <#selection-caret>
After typing ling 5:
| "line 1"
Modified: trunk/LayoutTests/editing/pasteboard/pasting-into-h6-should-not-nest-h6-expected.txt (231629 => 231630)
--- trunk/LayoutTests/editing/pasteboard/pasting-into-h6-should-not-nest-h6-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/editing/pasteboard/pasting-into-h6-should-not-nest-h6-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -25,6 +25,7 @@
| style="color: blue"
| "Blue Line 1"
| <br>
+| <#selection-caret>
| <h6>
| "Black Line"
| <h6>
Modified: trunk/LayoutTests/editing/pasteboard/pasting-into-p-should-not-nest-p-expected.txt (231629 => 231630)
--- trunk/LayoutTests/editing/pasteboard/pasting-into-p-should-not-nest-p-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/editing/pasteboard/pasting-into-p-should-not-nest-p-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -49,6 +49,7 @@
| <span>
| id="source"
| "Copy this line"
+| <#selection-caret>
| <div>
| <span>
| <br>
Modified: trunk/LayoutTests/editing/style/apply-style-atomic-expected.txt (231629 => 231630)
--- trunk/LayoutTests/editing/style/apply-style-atomic-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/editing/style/apply-style-atomic-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -17,3 +17,4 @@
| pseudo="-webkit-progress-value"
| style="width: -100%;"
| shadow:pseudoId="-webkit-progress-value"
+| <#selection-focus>
Modified: trunk/LayoutTests/fast/events/5056619-expected.txt (231629 => 231630)
--- trunk/LayoutTests/fast/events/5056619-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/fast/events/5056619-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -10,6 +10,7 @@
| <span>
| id="span"
| "Dragme"
+| <#selection-caret>
| "
"
| <script>
Modified: trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-1-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-1-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-1-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -58,4 +58,5 @@
๐โ๐จ<#selection-caret>"
Dump of markup 15:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-2-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-2-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-2-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -42,4 +42,5 @@
๐จโ๐งโ๐ง<#selection-caret>"
Dump of markup 11:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-3-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-3-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-3-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -42,4 +42,5 @@
๐๐ปโโ๏ธ<#selection-caret>"
Dump of markup 11:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-4-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-4-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-4-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -42,4 +42,5 @@
๐๐ฝโโ๏ธ<#selection-caret>"
Dump of markup 11:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-5-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-5-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-5-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -46,4 +46,5 @@
๐๐ฟโโ๏ธ<#selection-caret>"
Dump of markup 12:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-6-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-6-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-6-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -38,4 +38,5 @@
๐๐ปโโ<#selection-caret>"
Dump of markup 10:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-7-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-7-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-7-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -46,4 +46,5 @@
๐๐ป<#selection-caret>"
Dump of markup 12:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-8-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-8-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-8-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -46,4 +46,5 @@
๐คท<#selection-caret>"
Dump of markup 12:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-9-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-9-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-9-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -58,4 +58,5 @@
๐ค๐ป<#selection-caret>"
Dump of markup 15:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/ios/editing/deleting/delete-emoji-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -42,4 +42,5 @@
๐ฆ๐ป<#selection-caret>"
Dump of markup 11:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-1-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-1-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-1-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -58,4 +58,5 @@
๐โ๐จ<#selection-caret>"
Dump of markup 15:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-2-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-2-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-2-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -42,4 +42,5 @@
๐จโ๐งโ๐ง<#selection-caret>"
Dump of markup 11:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-3-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-3-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-3-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -42,4 +42,5 @@
๐๐ปโโ๏ธ<#selection-caret>"
Dump of markup 11:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-4-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-4-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-4-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -42,4 +42,5 @@
๐๐ฝโโ๏ธ<#selection-caret>"
Dump of markup 11:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-5-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-5-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-5-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -46,4 +46,5 @@
๐๐ฟโโ๏ธ<#selection-caret>"
Dump of markup 12:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-6-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-6-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-6-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -38,4 +38,5 @@
๐๐ปโโ<#selection-caret>"
Dump of markup 10:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-7-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-7-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-7-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -46,4 +46,5 @@
๐๐ป<#selection-caret>"
Dump of markup 12:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-8-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-8-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-8-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -46,4 +46,5 @@
๐คท<#selection-caret>"
Dump of markup 12:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-9-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-9-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-9-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -58,4 +58,5 @@
๐ค๐ป<#selection-caret>"
Dump of markup 15:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/mac/editing/deleting/delete-emoji-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -42,4 +42,5 @@
๐ฆ๐ป<#selection-caret>"
Dump of markup 11:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-1-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-1-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-1-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -58,4 +58,5 @@
๐โ๐จ<#selection-caret>"
Dump of markup 15:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-2-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-2-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-2-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -42,4 +42,5 @@
๐จโ๐งโ๐ง<#selection-caret>"
Dump of markup 11:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-3-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-3-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-3-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -42,4 +42,5 @@
๐๐ปโโ๏ธ<#selection-caret>"
Dump of markup 11:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-4-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-4-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-4-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -42,4 +42,5 @@
๐๐ฝโโ๏ธ<#selection-caret>"
Dump of markup 11:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-5-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-5-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-5-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -46,4 +46,5 @@
๐๐ฟโโ๏ธ<#selection-caret>"
Dump of markup 12:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-6-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-6-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-6-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -38,4 +38,5 @@
๐๐ปโโ<#selection-caret>"
Dump of markup 10:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-7-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-7-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-7-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -46,4 +46,5 @@
๐๐ป<#selection-caret>"
Dump of markup 12:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-8-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-8-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-8-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -46,4 +46,5 @@
๐คท<#selection-caret>"
Dump of markup 12:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-9-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-9-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/mac-sierra/editing/deleting/delete-emoji-9-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -142,4 +142,5 @@
๐ค๐ป<#selection-caret>"
Dump of markup 36:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-1-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-1-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-1-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -114,4 +114,5 @@
๐โ<#selection-caret>"
Dump of markup 29:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-2-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-2-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-2-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -106,4 +106,5 @@
๐จโ<#selection-caret>"
Dump of markup 27:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-3-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-3-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-3-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -114,4 +114,5 @@
๐<#selection-caret>"
Dump of markup 29:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-4-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-4-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-4-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -114,4 +114,5 @@
๐<#selection-caret>"
Dump of markup 29:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-5-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-5-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-5-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -106,4 +106,5 @@
๐<#selection-caret>"
Dump of markup 27:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-6-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-6-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-6-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -98,4 +98,5 @@
๐<#selection-caret>"
Dump of markup 25:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-7-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-7-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-7-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -106,4 +106,5 @@
๐<#selection-caret>"
Dump of markup 27:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-8-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-8-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-8-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -102,4 +102,5 @@
๐คท<#selection-caret>"
Dump of markup 26:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-9-expected.txt (231629 => 231630)
--- trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-9-expected.txt 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/platform/wincairo/editing/deleting/delete-emoji-9-expected.txt 2018-05-10 06:39:01 UTC (rev 231630)
@@ -158,4 +158,5 @@
๐ค<#selection-caret>"
Dump of markup 40:
+| <#selection-caret>
| <br>
Modified: trunk/LayoutTests/resources/dump-as-markup.js (231629 => 231630)
--- trunk/LayoutTests/resources/dump-as-markup.js 2018-05-10 04:25:49 UTC (rev 231629)
+++ trunk/LayoutTests/resources/dump-as-markup.js 2018-05-10 06:39:01 UTC (rev 231630)
@@ -135,8 +135,15 @@
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 @@
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 @@
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)
