Skip to content

GitLab

T
tangled
Commit 67b5dc83 authored by Yoshifumi Inoue's avatar Yoshifumi Inoue Committed by Commit Bot
Browse files
Options

Utilize selection_test() in editing/pasteboard/merge-start-list.html 

This patch changes "merge-start-list.html" to utilize |selection_test()|
for ease of maintenance.

Bug: 679977, 707656
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_layout_tests_layout_ng
Change-Id: I4cb1f79ae6df06a47114550e7af32439d994a186
Reviewed-on: https://chromium-review.googlesource.com/1071155Reviewed-by: default avatarYoichi Osato <yoichio@chromium.org>
Commit-Queue: Yoshifumi Inoue <yosin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#561432}
parent f57f3b2b
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 82 deletions
third_party/WebKit/LayoutTests/FlagExpectations/enable-blink-features=LayoutNG
View file @ 67b5dc83
...@@ -189,7 +189,6 @@ crbug.com/591099 editing/pasteboard/copy-paste-white-space.html [ Failure ] ...@@ -189,7 +189,6 @@ crbug.com/591099 editing/pasteboard/copy-paste-white-space.html [ Failure ]
crbug.com/591099 editing/pasteboard/drag-image-to-contenteditable-in-iframe.html [ Failure ] crbug.com/591099 editing/pasteboard/drag-image-to-contenteditable-in-iframe.html [ Failure ]
crbug.com/591099 editing/pasteboard/drag-list-item.html [ Failure ] crbug.com/591099 editing/pasteboard/drag-list-item.html [ Failure ]
crbug.com/591099 editing/pasteboard/dragstart-contains-default-content.html [ Failure ] crbug.com/591099 editing/pasteboard/dragstart-contains-default-content.html [ Failure ]
crbug.com/591099 editing/pasteboard/merge-start-list.html [ Failure ]
crbug.com/591099 editing/pasteboard/paste-noscript.html [ Failure ] crbug.com/591099 editing/pasteboard/paste-noscript.html [ Failure ]
crbug.com/591099 editing/selection/4402375.html [ Failure ] crbug.com/591099 editing/selection/4402375.html [ Failure ]
crbug.com/591099 editing/selection/4776665.html [ Failure ] crbug.com/591099 editing/selection/4776665.html [ Failure ]
......
third_party/WebKit/LayoutTests/editing/pasteboard/merge-start-list.html
View file @ 67b5dc83
<!doctype html>
<script src="../../resources/testharness.js"></script>
<script src="../../resources/testharnessreport.js"></script>
<script src="../assert_selection.js"></script>
<script> <script>
if (window.testRunner) // This test makes sure that content inside a list in an incoming fragment isn't
testRunner.dumpEditingCallbacks(); // pulled out of the list during paste.
</script> selection_test(
<p>This test makes sure that content inside a list in an incoming fragment isn't pulled out of the list during paste.</p> '<div contenteditable>|</div>',
<p><b>You should see 'bar' inside a list item.</b></p> 'InsertHTML <ul><li>bar</li></ul>',
'<div contenteditable><ul><li>bar|</li></ul></div>',
<div id="test" contenteditable="true"></div> 'Insert list');
<script>
var s = window.getSelection();
var e = document.getElementById("test");
s.collapse(e, 0);
document.execCommand("InsertHTML", false , "<ul><li>bar</li></ul>");
</script> </script>
third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/merge-start-list-expected.txt deleted 100644 → 0
View file @ f57f3b2b
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
layer at (0,0) size 800x600
LayoutView at (0,0) size 800x600
layer at (0,0) size 800x600
LayoutBlockFlow {HTML} at (0,0) size 800x600
LayoutBlockFlow {BODY} at (8,8) size 784x576
LayoutBlockFlow {P} at (0,0) size 784x20
LayoutText {#text} at (0,0) size 679x19
text run at (0,0) width 679: "This test makes sure that content inside a list in an incoming fragment isn't pulled out of the list during paste."
LayoutBlockFlow {P} at (0,36) size 784x20
LayoutInline {B} at (0,0) size 251x19
LayoutText {#text} at (0,0) size 251x19
text run at (0,0) width 251: "You should see 'bar' inside a list item."
LayoutBlockFlow {DIV} at (0,72) size 784x20
LayoutBlockFlow {UL} at (0,0) size 784x20
LayoutListItem {LI} at (40,0) size 744x20
LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet
LayoutText {#text} at (0,0) size 20x19
text run at (0,0) width 20: "bar"
caret: position 3 of child 0 {#text} of child 0 {LI} of child 0 {UL} of child 4 {DIV} of body
third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/merge-start-list-expected.txt deleted 100644 → 0
View file @ f57f3b2b
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
layer at (0,0) size 800x600
LayoutView at (0,0) size 800x600
layer at (0,0) size 800x600
LayoutBlockFlow {HTML} at (0,0) size 800x600
LayoutBlockFlow {BODY} at (8,8) size 784x576
LayoutBlockFlow {P} at (0,0) size 784x18
LayoutText {#text} at (0,0) size 698x18
text run at (0,0) width 698: "This test makes sure that content inside a list in an incoming fragment isn't pulled out of the list during paste."
LayoutBlockFlow {P} at (0,34) size 784x18
LayoutInline {B} at (0,0) size 257x18
LayoutText {#text} at (0,0) size 257x18
text run at (0,0) width 257: "You should see 'bar' inside a list item."
LayoutBlockFlow {DIV} at (0,68) size 784x18
LayoutBlockFlow {UL} at (0,0) size 784x18
LayoutListItem {LI} at (40,0) size 744x18
LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet
LayoutText {#text} at (0,0) size 21x18
text run at (0,0) width 21: "bar"
caret: position 3 of child 0 {#text} of child 0 {LI} of child 0 {UL} of child 4 {DIV} of body
third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/merge-start-list-expected.txt deleted 100644 → 0
View file @ f57f3b2b
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
layer at (0,0) size 800x600
LayoutView at (0,0) size 800x600
layer at (0,0) size 800x600
LayoutBlockFlow {HTML} at (0,0) size 800x600
LayoutBlockFlow {BODY} at (8,8) size 784x576
LayoutBlockFlow {P} at (0,0) size 784x20
LayoutText {#text} at (0,0) size 639x19
text run at (0,0) width 639: "This test makes sure that content inside a list in an incoming fragment isn't pulled out of the list during paste."
LayoutBlockFlow {P} at (0,36) size 784x20
LayoutInline {B} at (0,0) size 248x19
LayoutText {#text} at (0,0) size 248x19
text run at (0,0) width 248: "You should see 'bar' inside a list item."
LayoutBlockFlow {DIV} at (0,72) size 784x20
LayoutBlockFlow {UL} at (0,0) size 784x20
LayoutListItem {LI} at (40,0) size 744x20
LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet
LayoutText {#text} at (0,0) size 20x19
text run at (0,0) width 20: "bar"
caret: position 3 of child 0 {#text} of child 0 {LI} of child 0 {UL} of child 4 {DIV} of body
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment