Bug 1493918 [wpt PR 13191] - Use MoveParagraphWithClones when moving paragraphs to new list items, a=testonly

Automatic update from web-platform-testsUse MoveParagraphWithClones when moving paragraphs to new list items

The MoveParagraph function doesn't guarantee the paragraph's style is
preserved when the insertOrderedList/insertOnordered list commands
are used.

Instead, we should use MoveParagraphWithClones. This change implies
rebaseline a few tests, since the result tree is different than the
one created with MoveParagraph.

Bug: 149901
Cq-Include-Trybots: luci.chromium.try​:linux_layout_tests_layout_ng
Change-Id: I01e5a9ade28d3c16e8dc5423bf16dcf0d7e60976
Reviewed-on: https://chromium-review.googlesource.com/c/1216282
Commit-Queue: Javier Fernandez <jfernandez@igalia.com>
Reviewed-by: Yoshifumi Inoue <yosin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#600342}

--

wpt-commits: 1e4952152600544618802f49676d17c1c2e261d7
wpt-pr: 13191
This commit is contained in:
Javier Fernandez 2018-10-29 17:16:42 +00:00 committed by James Graham
parent 6c217afa63
commit a87c5232ba
3 changed files with 21 additions and 6 deletions

View File

@ -2,17 +2,17 @@
var browserTests = [
['<div contenteditable="true"><table><tr><td>[fsdf]</td><td>fsdf</td></tr><tr><td>gghfg</td><td>fsfg</td></tr></table></div>',
[["insertOrderedList",""]],
'<div contenteditable="true"><table><tbody><tr><td><ol><li>fsdf<br></li></ol></td><td>fsdf</td></tr><tr><td>gghfg</td><td>fsfg</td></tr></tbody></table></div>',
'<div contenteditable="true"><table><tbody><tr><td><ol><li>fsdf</li></ol></td><td>fsdf</td></tr><tr><td>gghfg</td><td>fsfg</td></tr></tbody></table></div>',
[true],
{"insertOrderedList":[false,false,"false",false,true,"true"]}],
['<div contenteditable="true"><table><tr data-start=0 data-end=2><td>fsdf</td><td>fsdf</td></tr><tr><td>gghfg</td><td>fsfg</td></tr></table></div>',
[["insertOrderedList",""]],
'<div contenteditable="true"><table><tbody><tr><td><ol><li>fsdf<br></li></ol></td><td><ol><li>fsdf<br></li></ol></td></tr><tr><td>gghfg</td><td>fsfg</td></tr></tbody></table></div>',
'<div contenteditable="true"><table><tbody><tr><td><ol><li>fsdf</li></ol></td><td><ol><li>fsdf</li></ol></td></tr><tr><td>gghfg</td><td>fsfg</td></tr></tbody></table></div>',
[true],
{"insertOrderedList":[false,false,"false",false,false,"false"]}],
['<div contenteditable="true"><table><tr data-start=0><td>fsdf</td><td>fsdf</td></tr><tr data-end=2><td>gghfg</td><td>fsfg</td></tr></table></div>',
[["insertOrderedList",""]],
'<div contenteditable="true"><table><tbody><tr><td><ol><li>fsdf<br></li></ol></td><td><ol><li>fsdf<br></li></ol></td></tr><tr><td><ol><li>gghfg<br></li></ol></td><td><ol><li>fsfg<br></li></ol></td></tr></tbody></table></div>',
'<div contenteditable="true"><table><tbody><tr><td><ol><li>fsdf</li></ol></td><td><ol><li>fsdf</li></ol></td></tr><tr><td><ol><li>gghfg</li></ol></td><td><ol><li>fsfg</li></ol></td></tr></tbody></table></div>',
[true],
{"insertOrderedList":[false,false,"false",false,false,"false"]}],
['<div contenteditable="true"><table data-start=0 data-end=1><tr><td>fsdf</td><td>fsdf</td></tr><tr><td>gghfg</td><td>fsfg</td></tr></table></div>',

View File

@ -674,5 +674,20 @@ var browserTests = [
[["defaultparagraphseparator","p"],["insertorderedlist",""]],
"<ol><li>foo</li> <li>[bar]</li> <li>baz</li></ol>",
[true,true],
{"defaultparagraphseparator":[false,false,"div",false,false,"p"],"insertorderedlist":[false,false,"",false,true,""]}]
{"defaultparagraphseparator":[false,false,"div",false,false,"p"],"insertorderedlist":[false,false,"",false,true,""]}],
["<div><span style='font-family: times; color: blue'>[bar]</span></div>",
[["insertorderedlist",""]],
"<ol><li><span style=\"font-family:times; color:rgb(0, 0, 255)\">[bar]</span></li></ol>",
[true],
{"insertorderedlist":[false,false,"false",false,true,"true"]}],
["<div><span style='font-family: times; color: blue'>bar</span></div><span style='font-family: italic; color: green'>[baz]</span>",
[["insertorderedlist",""]],
"<div><span style=\"font-family:times; color:rgb(0, 0, 255)\">bar</span></div><ol><li><span style=\"font-family:italic; color:rgb(0, 128, 0)\">[baz]</span></li></ol>",
[true],
{"insertorderedlist":[false,false,"false",false,true,"true"]}],
["<div><ol style='font-family: times; color: blue'><li>bar</li></ol><span style='font-family: italic; color: green'>[baz]</span></div>",
[["insertorderedlist",""]],
"<ol style=\"font-family:times; color:rgb(0, 0, 255)\"><li>bar</li><li><span style=\"font-family:italic; color:rgb(0, 128, 0)\">[baz]</span></li></ol>",
[true],
{"insertorderedlist":[false,false,"false",false,true,"true"]}],
]

View File

@ -35,9 +35,9 @@ test(function() {
testExecCommandInputType('insertText', 'bc', 'insertText');
assert_equals(txt.innerHTML, 'abc');
testExecCommandInputType('insertOrderedList', null, 'insertOrderedList');
assert_equals(txt.innerHTML, '<ol><li>abc<br></li></ol>');
assert_equals(txt.innerHTML, '<ol><li>abc</li></ol>');
testExecCommandInputType('insertUnorderedList', null, 'insertUnorderedList');
assert_equals(txt.innerHTML, '<ul><li>abc<br></li></ul>');
assert_equals(txt.innerHTML, '<ul><li>abc</li></ul>');
testExecCommandInputType('insertLineBreak', null, 'insertLineBreak');
testExecCommandInputType('insertParagraph', null, 'insertParagraph');