Attachment #192897 for bug #110610

View Details Raw Unified Return to Bug 110610

| Differences between



2013-03-13  Sergio Villar Senin  <svillar@igalia.com>

        Empty list items after drag&drop in contentEditable divs
        https://bugs.webkit.org/show_bug.cgi?id=110610

        Reviewed by NOBODY (OOPS!).

        Perform a cleanup after moving operations. This will mainly prune
        extra placeholders left by the editing algorithms. Also do not
        leave empty <li> when moving them around inside a list element.

        Tests: editing/moving/cleanup-on-move.html
               editing/moving/drag-list-item.html

        * editing/MoveSelectionCommand.cpp:
        (WebCore::MoveSelectionCommand::doApply): perform
        cleanupAfterDeletion().
        * editing/ReplaceSelectionCommand.cpp:
        (WebCore::ReplaceSelectionCommand::insertAsListItems): do not
        insert an empty list item.
        * editing/MoveSelectionCommand.cpp:
        (WebCore::MoveSelectionCommand::doApply):
        * editing/ReplaceSelectionCommand.cpp:
        (WebCore::ReplaceSelectionCommand::insertAsListItems):

2013-03-13  Mike West  <mkwst@chromium.org>

        Pass the XSSAuditor's report URL to the XSSAuditorDelegate on the main thread.

Lines 65-70 void MoveSelectionCommand::doApply() a/Source/WebCore/editing/MoveSelectionCommand.cpp_sec1
- a/Source/WebCore/editing/MoveSelectionCommand.cpp +2 lines
65	if (!pos.anchorNode()->inDocument())	65	if (!pos.anchorNode()->inDocument())
66	pos = endingSelection().start();	66	pos = endingSelection().start();
67		67
		68	cleanupAfterDeletion(pos);
		69
68	setEndingSelection(VisibleSelection(pos, endingSelection().affinity(), endingSelection().isDirectional()));	70	setEndingSelection(VisibleSelection(pos, endingSelection().affinity(), endingSelection().isDirectional()));
69	if (!pos.anchorNode()->inDocument()) {	71	if (!pos.anchorNode()->inDocument()) {
70	// Document was modified out from under us.	72	// Document was modified out from under us.



    }
    if (isStart || isMiddle)
        lastNode = lastNode->previousSibling();
    if (isMiddle)
        insertNodeAfter(createListItemElement(document()), lastNode);
    return lastNode;
}




2013-03-13  Sergio Villar Senin  <svillar@igalia.com>

        Empty list items after drag&drop in contentEditable divs
        https://bugs.webkit.org/show_bug.cgi?id=110610

        Reviewed by NOBODY (OOPS!).

        Some placeholders should not be left after performing a cleanup in
        move operations, this includes the empty list items generated when
        moving around list items inside a list.

        I added a new directory called moving/ inside the editing/ tests
        for the new test this change adds. Also I'm moving
        drag-list-item.html to this new location because it fits there
        much better than in selection/.

        * editing/moving/cleanup-on-move-expected.txt: Added.
        * editing/moving/cleanup-on-move.html: Added.
        * editing/moving/drag-list-item-expected.txt: Renamed from LayoutTests/editing/selection/drag-list-item-expected.txt.
        * editing/moving/drag-list-item.html: Renamed from LayoutTests/editing/selection/drag-list-item.html.
        * editing/moving/resources/select-and-drag.js: Added.
        (selectAndDragToTarget): Selects nodes and drops them after a target node.
        * editing/pasteboard/drag-drop-list-expected.txt: Removed an empty <li>.
        * editing/pasteboard/paste-list-004-expected.txt: Removed 2 empty <li>.
        * editing/pasteboard/paste-list-004.html: Ditto.
        * editing/selection/4895428-1-expected.txt: Removed a <br>.
        * editing/selection/4895428-4-expected.txt: Ditto.
        * fast/events/ondragenter-expected.txt: Removed a blank line.
        * platform/chromium/fast/events/ondragenter-expected.txt: Ditto.
        * platform/efl/TestExpectations: Added cleanup-on-move.html to the skipped list.
        * platform/mac-wk2/TestExpectations: Ditto.
        * platform/qt/TestExpectations: Ditto.
        * platform/win/fast/events/ondragenter-expected.txt: Removed a blank line.

2013-03-13  Ádám Kallai  <kadam@inf.u-szeged.hu>

        [Qt] Unreviewed gardening. Unskip now passing compositing tests.



This test drags a selection of a couple of <li> and drops them after another <li> in the same list. It verifies that no empty <li> (actually with a <br> inside) are left after the moving operation.

The original list looks like this. 'two' and 'three' are going to be selected and pasted after 'four':
| "
"
| <li>
|   id="one"
|   "one"
| <li>
|   id="two"
|   "two"
| <li>
|   id="three"
|   "three"
| <li>
|   id="four"
|   "four"
| "
"

'two' and 'three' should appear as <li> after 'four' and not empty (or with a <br> placeholder) <li> should be there:
| "
"
| <li>
|   id="one"
|   "one"
| <li>
|   id="four"
|   "four"
| <li>
|   id="two"
|   "two"
| <li>
|   id="three"
|   "three"
| "
"



<!DOCTYPE html>

<body>
<script src="../../resources/dump-as-markup.js"></script>
<script src="resources/select-and-drag.js"></script>
<div contenteditable="true">
<ol id="test">
<li id="one">one</li><li id="two">two</li><li id="three">three</li><li id="four">four</li>
</ol>
</div>

<script>
Markup.description('This test drags a selection of a couple of <li> and drops them after another <li> in the same list. It verifies that no empty <li> (actually with a <br> inside) are left after the moving operation.');

if (window.testRunner) {
    Markup.dump("test", "The original list looks like this. 'two' and 'three' are going to be selected and pasted after 'four'");
    selectAndDragToTarget("test", "two", "three", 5, "four");
    Markup.dump("test", "'two' and 'three' should appear as <li> after 'four' and not empty (or with a <br> placeholder) <li> should be there");
}
</script>
</body>
</html>



This test drags a selection of one <li> and drops them after another <li> in the first list. The same test is repeated in the second list but this time with two selected items instead of one. It verifies that the behavior is independent of how many fully selected items we move, i.e. fully selected <li> are moved as <li> and not just as plain text

The original list looks like this. 'two' is going to be selected and pasted after 'four':
| "
"
| <li>
|   id="one"
|   "one"
| <li>
|   id="two"
|   "two"
| <li>
|   id="three"
|   "three"
| <li>
|   id="four"
|   "four"
| "
"

'two' should appear as a new <li> after 'four':
| "
"
| <li>
|   id="one"
|   "one"
| <li>
|   id="three"
|   "three"
| <li>
|   id="four"
|   "four"
| <li>
|   id="two"
|   "two"
| "
"

The original list looks like this. 'two' and 'three' are going to be selected and pasted after 'four':
| <li>
|   id="one"
|   "one"
| <li>
|   id="two"
|   "two"
| <li>
|   id="three"
|   "three"
| <li>
|   id="four"
|   "four"

'two' and 'three' should appear as <li> after 'four':
| <li>
|   id="one"
|   "one"
| <li>
|   id="four"
|   "four"
| <li>
|   id="two"
|   "two"
| <li>
|   id="three"
|   "three"



<!DOCTYPE html>

<body>
<script src="../../resources/dump-as-markup.js"></script>
<script src="resources/select-and-drag.js"></script>
<div contenteditable="true">
<ol id="test">
<li id="one">one</li><li id="two">two</li><li id="three">three</li><li id="four">four</li>
</ol>
</div>

<script>
Markup.description('This test drags a selection of one <li> and drops them after another <li> in the first list. The same test is repeated in the second list but this time with two selected items instead of one. It verifies that the behavior is independent of how many fully selected items we move, i.e. fully selected <li> are moved as <li> and not just as plain text');

if (window.testRunner) {

    Markup.dump("test", "The original list looks like this. 'two' is going to be selected and pasted after 'four'");
    selectAndDragToTarget("test", "two", "two", 4, "four");
    Markup.dump("test", "'two' should appear as a new <li> after 'four'");

    document.getElementById("test").innerHTML = "<li id=\"one\">one</li><li id=\"two\">two</li>"
        + "<li id=\"three\">three</li><li id=\"four\">four</li>";
    Markup.dump("test", "The original list looks like this. 'two' and 'three' are going to be selected and pasted after 'four'");
    selectAndDragToTarget("test", "two", "three", 5, "four");
    Markup.dump("test", "'two' and 'three' should appear as <li> after 'four'");
}
</script>
</body>
</html>



function selectAndDragToTarget(testElement, startSelectionElement, endSelectionElement, endSelectionElementOffset, targetElement) {

    var testElement = document.getElementById(testElement);
    var selection = window.getSelection();
    selection.setPosition(testElement, 0);

    var start = document.getElementById(startSelectionElement);
    var startx = start.offsetLeft;
    var starty = start.offsetTop + start.offsetHeight / 2;
    selection.setBaseAndExtent(start, 0, document.getElementById(endSelectionElement), endSelectionElementOffset);

    eventSender.mouseMoveTo(startx, starty);
    eventSender.mouseDown();

    eventSender.leapForward(200);

    var target = document.getElementById(targetElement);
    var targetx = target.parentNode.offsetLeft + target.offsetLeft + target.offsetWidth / 2;
    var targety = target.offsetTop + target.offsetHeight / 2;

    eventSender.mouseMoveTo(targetx, targety);
    eventSender.mouseUp();

    selection.collapse();
}

Lines 11-17 This tests dropping content onto a list items content when the content is wrappe a/LayoutTests/editing/pasteboard/drag-drop-list-expected.txt_sec1
- a/LayoutTests/editing/pasteboard/drag-drop-list-expected.txt -2 lines
11	\| "DropAboveMe<#selection-anchor> DragMe<#selection-focus>"	11	\| "DropAboveMe<#selection-anchor> DragMe<#selection-focus>"
12	\| "	12	\| "
13	"	13	"
14	\| <div>
15	\| <br>
16	\| "	14	\| "
17	"	15	"



one two: one two
three: three
one two: one two
:
four: four
monsters walking: <span style="background-color:green"><b>monsters walking</b></span>
one two: one two
:
cross the floor: <span style="background-color:green"><b>cross the floor</b></span>
PASS




    pasteCommand();

    // Place the cursor between "walking" and "cross"
    moveSelectionForwardByLineCommand();
        moveSelectionForwardByLineCommand();
    for (var i = 0; i < 2; ++i)
        moveSelectionForwardByWordCommand();


        "one two",
        "three",
        "one two",
        "",
        "four",
        "monsters walking",
        "one two",
        "",
        "cross the floor"
        ];
    if (listItems.length != 7)
        throw "Expected 7 list items, found " + listItems.length;
    for (var i = 0; i < results.length; ++i) {
        var actual = listItems[i].innerText.replace(/^\s+/g, "");
        if (results[i] != actual)
            throw "Unexpected list item: " + i + "," + results[i] + "," + listItems[i].innerText;
    }

    // Verify that the cursor is in the right place (at the beginning of 'cross the floor').
    var selection = window.getSelection();
    if (selection.baseNode != listItems[6].firstChild.firstChild.firstChild || selection.baseOffset != 0 || !selection.isCollapsed)
        throw "Wrong selection position";

    for (var i = 0; i < listItems.length; ++i) {

Lines 5-11 This tests dragging a selected table by mousing down on the contents of one of i a/LayoutTests/editing/selection/4895428-1-expected.txt_sec1
- a/LayoutTests/editing/selection/4895428-1-expected.txt -1 lines
5	\| contenteditable="true"	5	\| contenteditable="true"
6	\| id="source"	6	\| id="source"
7	\| style="border: 1px solid blue;"	7	\| style="border: 1px solid blue;"
8	\| <br>
9	\| "	8	\| "
10	"	9	"
11	\| <div>	10	\| <div>

Lines 7-13 This tests to see if an editable selection containing a focusable node is dragga a/LayoutTests/editing/selection/4895428-4-expected.txt_sec1
- a/LayoutTests/editing/selection/4895428-4-expected.txt -1 lines
7	\| style="border: 1px solid blue;"	7	\| style="border: 1px solid blue;"
8	\| "	8	\| "
9	"	9	"
10	\| <br>
11	\| "	10	\| "
12	"	11	"
13	\| "	12	\| "



This test drags a selection of one <li> and drops them after another <li> in the first list. The same test is repeated in the second list but this time with two selected items instead of one. It verifies that the behavior is independent of how many fully selected items we move, i.e. fully selected <li> are moved as <li> and not just as plain text

The original list looks like this. 'two' is going to be selected and pasted after 'four':
| "
"
| <li>
|   id="one"
|   "one"
| <li>
|   id="two"
|   "two"
| <li>
|   id="three"
|   "three"
| <li>
|   id="four"
|   "four"
| "
"

'two' should appear as a new <li> after 'four':
| "
"
| <li>
|   id="one"
|   "one"
| <li>
|   id="two"
|   <br>
| <li>
|   id="three"
|   "three"
| <li>
|   id="four"
|   "four"
| <li>
|   id="two"
|   "two"
| "
"

The original list looks like this. 'two' and 'three' are going to be selected and pasted after 'four':
| <li>
|   id="one"
|   "one"
| <li>
|   id="two"
|   "two"
| <li>
|   id="three"
|   "three"
| <li>
|   id="four"
|   "four"

'two' and 'three' should appear as <li> after 'four':
| <li>
|   id="one"
|   "one"
| <li>
|   id="two"
|   <br>
| <li>
|   id="four"
|   "four"
| <li>
|   id="two"
|   "two"
| <li>
|   id="three"
|   "three"



<!DOCTYPE html>

<body>
<script src="../../resources/dump-as-markup.js"></script>
<div contenteditable="true">
<ol id="test">
<li id="one">one</li><li id="two">two</li><li id="three">three</li><li id="four">four</li>
</ol>
</div>

<script>
Markup.description('This test drags a selection of one <li> and drops them after another <li> in the first list. The same test is repeated in the second list but this time with two selected items instead of one. It verifies that the behavior is independent of how many fully selected items we move, i.e. fully selected <li> are moved as <li> and not just as plain text');

function editingTest(testElement, startSelectionElement, endSelectionElement, endSelectionElementOffset, targetElement) {

    var testElement = document.getElementById(testElement);
    var selection = window.getSelection();
    selection.setPosition(testElement, 0);

    var start = document.getElementById(startSelectionElement);
    var startx = start.offsetLeft;
    var starty = start.offsetTop + start.offsetHeight / 2;
    selection.setBaseAndExtent(start, 0, document.getElementById(endSelectionElement), endSelectionElementOffset);

    eventSender.mouseMoveTo(startx, starty);
    eventSender.mouseDown();

    eventSender.leapForward(200);

    var target = document.getElementById(targetElement);
    var targetx = target.parentNode.offsetLeft + target.offsetLeft + target.offsetWidth / 2;
    var targety = target.offsetTop + target.offsetHeight / 2;

    eventSender.mouseMoveTo(targetx, targety);
    eventSender.mouseUp();

    selection.collapse();
}

if (window.testRunner) {

    Markup.dump("test", "The original list looks like this. 'two' is going to be selected and pasted after 'four'");
    editingTest("test", "two", "two", 4, "four");
    Markup.dump("test", "'two' should appear as a new <li> after 'four'");

    document.getElementById("test").innerHTML = "<li id=\"one\">one</li><li id=\"two\">two</li>"
        + "<li id=\"three\">three</li><li id=\"four\">four</li>";
    Markup.dump("test", "The original list looks like this. 'two' and 'three' are going to be selected and pasted after 'four'");
    editingTest("test", "two", "three", 5, "four");
    Markup.dump("test", "'two' and 'three' should appear as <li> after 'four'");
}
</script>
</body>
</html>

Lines 1-3 a/LayoutTests/fast/events/ondragenter-expected.txt_sec1
- a/LayoutTests/fast/events/ondragenter-expected.txt -1 lines
1
2	Success: Text	1	Success: Text
3	This automated layout test checks to see that ondragenter events are being sent.	2	This automated layout test checks to see that ondragenter events are being sent.

Lines 1-3 a/LayoutTests/platform/chromium/fast/events/ondragenter-expected.txt_sec1
- a/LayoutTests/platform/chromium/fast/events/ondragenter-expected.txt -1 lines
1
2	Success: Text	1	Success: Text
3	This automated layout test checks to see that ondragenter events are being sent.	2	This automated layout test checks to see that ondragenter events are being sent.



webkit.org/b/86623 http/tests/security/dataTransfer-set-data-file-url.html
webkit.org/b/86623 http/tests/security/drag-drop-different-origin.html
webkit.org/b/86623 http/tests/security/drag-over-remote-content-iframe.html
webkit.org/b/86623 editing/moving/cleanup-on-move.html [ Failure ]
webkit.org/b/86623 editing/moving/drag-list-item.html [ Failure ]

# Missing drag'n'drop, needs baselines
webkit.org/b/86623 editing/pasteboard/4947130.html [ Missing ]

Lines 571-576 fast/events/moving-text-should-fire-drop-and-dragend-events-2.html a/LayoutTests/platform/qt/TestExpectations_sec1
- a/LayoutTests/platform/qt/TestExpectations -3 / +4 lines
571	fast/events/input-element-display-none-in-dragleave-crash.html	571	fast/events/input-element-display-none-in-dragleave-crash.html
572	fast/events/only-valid-drop-targets-receive-file-drop.html	572	fast/events/only-valid-drop-targets-receive-file-drop.html
573		573
		574	# New test added in r145195 is failing
		575	webkit.org/b/111853 editing/moving/cleanup-on-move.html [ Skip ]
		576	webkit.org/b/111853 editing/moving/drag-list-item.html [ Skip ]
		577
574	# =========================================================================== #	578	# =========================================================================== #
575	# Failing HTTP tests. #	579	# Failing HTTP tests. #
576	# =========================================================================== #	580	# =========================================================================== #
Lines 2676-2684 webkit.org/b/111606 fast/borders/border-fit-2.html [ Skip ] a/LayoutTests/platform/qt/TestExpectations_sec2
2676	webkit.org/b/111606 fast/borders/border-fit.html [ Skip ]	2680	webkit.org/b/111606 fast/borders/border-fit.html [ Skip ]
2677	webkit.org/b/111606 fast/repaint/border-fit-lines.html [ Skip ]	2681	webkit.org/b/111606 fast/repaint/border-fit-lines.html [ Skip ]
2678		2682
2679	# New test added in r145195 is failing
2680	webkit.org/b/111853 editing/selection/drag-list-item.html [ Skip ]
2681
2682	# jack server is not running or cannot be started	2683	# jack server is not running or cannot be started
2683	fast/dom/beforeload/remove-video-poster-in-beforeload-listener.html	2684	fast/dom/beforeload/remove-video-poster-in-beforeload-listener.html
2684	fast/dom/beforeload/remove-video-in-beforeload-listener.html	2685	fast/dom/beforeload/remove-video-in-beforeload-listener.html

Lines 1-3 a/LayoutTests/platform/win/fast/events/ondragenter-expected.txt_sec1
- a/LayoutTests/platform/win/fast/events/ondragenter-expected.txt -1 lines
1
2	Success: Text	1	Success: Text
3	This automated layout test checks to see that ondragenter events are being sent.	2	This automated layout test checks to see that ondragenter events are being sent.

Return to Bug 110610

Lines 1444-1451 Node* ReplaceSelectionCommand::insertAsListItems(PassRefPtr<HTMLElement> prpList a/Source/WebCore/editing/ReplaceSelectionCommand.cpp_sec1
- a/Source/WebCore/editing/ReplaceSelectionCommand.cpp -2 lines
1444	}	1444	}
1445	if (isStart \|\| isMiddle)	1445	if (isStart \|\| isMiddle)
1446	lastNode = lastNode->previousSibling();	1446	lastNode = lastNode->previousSibling();
1447	if (isMiddle)
1448	insertNodeAfter(createListItemElement(document()), lastNode);
1449	return lastNode;	1447	return lastNode;
1450	}	1448	}
1451		1449

Lines 454-460 webkit.org/b/86623 http/tests/misc/drag-over-iframe-invalid-source-crash.html a/LayoutTests/platform/efl/TestExpectations_sec1
- a/LayoutTests/platform/efl/TestExpectations -1 / +2 lines
454	webkit.org/b/86623 http/tests/security/dataTransfer-set-data-file-url.html	454	webkit.org/b/86623 http/tests/security/dataTransfer-set-data-file-url.html
455	webkit.org/b/86623 http/tests/security/drag-drop-different-origin.html	455	webkit.org/b/86623 http/tests/security/drag-drop-different-origin.html
456	webkit.org/b/86623 http/tests/security/drag-over-remote-content-iframe.html	456	webkit.org/b/86623 http/tests/security/drag-over-remote-content-iframe.html
457	webkit.org/b/86623 editing/selection/drag-list-item.html [ Failure ]	457	webkit.org/b/86623 editing/moving/cleanup-on-move.html [ Failure ]
		458	webkit.org/b/86623 editing/moving/drag-list-item.html [ Failure ]
458		459
459	# Missing drag'n'drop, needs baselines	460	# Missing drag'n'drop, needs baselines
460	webkit.org/b/86623 editing/pasteboard/4947130.html [ Missing ]	461	webkit.org/b/86623 editing/pasteboard/4947130.html [ Missing ]

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +25 lines
		1	2013-03-13 Sergio Villar Senin <svillar@igalia.com>
		2
		3	Empty list items after drag&drop in contentEditable divs
		4	https://bugs.webkit.org/show_bug.cgi?id=110610
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Perform a cleanup after moving operations. This will mainly prune
		9	extra placeholders left by the editing algorithms. Also do not
		10	leave empty <li> when moving them around inside a list element.
		11
		12	Tests: editing/moving/cleanup-on-move.html
		13	editing/moving/drag-list-item.html
		14
		15	* editing/MoveSelectionCommand.cpp:
		16	(WebCore::MoveSelectionCommand::doApply): perform
		17	cleanupAfterDeletion().
		18	* editing/ReplaceSelectionCommand.cpp:
		19	(WebCore::ReplaceSelectionCommand::insertAsListItems): do not
		20	insert an empty list item.
		21	* editing/MoveSelectionCommand.cpp:
		22	(WebCore::MoveSelectionCommand::doApply):
		23	* editing/ReplaceSelectionCommand.cpp:
		24	(WebCore::ReplaceSelectionCommand::insertAsListItems):
		25
1	2013-03-13 Mike West <mkwst@chromium.org>	26	2013-03-13 Mike West <mkwst@chromium.org>
2		27
3	Pass the XSSAuditor's report URL to the XSSAuditorDelegate on the main thread.	28	Pass the XSSAuditor's report URL to the XSSAuditorDelegate on the main thread.

Lines 1-3 a/LayoutTests/ChangeLog_sec1
- a/LayoutTests/ChangeLog +34 lines
		1	2013-03-13 Sergio Villar Senin <svillar@igalia.com>
		2
		3	Empty list items after drag&drop in contentEditable divs
		4	https://bugs.webkit.org/show_bug.cgi?id=110610
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Some placeholders should not be left after performing a cleanup in
		9	move operations, this includes the empty list items generated when
		10	moving around list items inside a list.
		11
		12	I added a new directory called moving/ inside the editing/ tests
		13	for the new test this change adds. Also I'm moving
		14	drag-list-item.html to this new location because it fits there
		15	much better than in selection/.
		16
		17	* editing/moving/cleanup-on-move-expected.txt: Added.
		18	* editing/moving/cleanup-on-move.html: Added.
		19	* editing/moving/drag-list-item-expected.txt: Renamed from LayoutTests/editing/selection/drag-list-item-expected.txt.
		20	* editing/moving/drag-list-item.html: Renamed from LayoutTests/editing/selection/drag-list-item.html.
		21	* editing/moving/resources/select-and-drag.js: Added.
		22	(selectAndDragToTarget): Selects nodes and drops them after a target node.
		23	* editing/pasteboard/drag-drop-list-expected.txt: Removed an empty <li>.
		24	* editing/pasteboard/paste-list-004-expected.txt: Removed 2 empty <li>.
		25	* editing/pasteboard/paste-list-004.html: Ditto.
		26	* editing/selection/4895428-1-expected.txt: Removed a <br>.
		27	* editing/selection/4895428-4-expected.txt: Ditto.
		28	* fast/events/ondragenter-expected.txt: Removed a blank line.
		29	* platform/chromium/fast/events/ondragenter-expected.txt: Ditto.
		30	* platform/efl/TestExpectations: Added cleanup-on-move.html to the skipped list.
		31	* platform/mac-wk2/TestExpectations: Ditto.
		32	* platform/qt/TestExpectations: Ditto.
		33	* platform/win/fast/events/ondragenter-expected.txt: Removed a blank line.
		34
1	2013-03-13 Ádám Kallai <kadam@inf.u-szeged.hu>	35	2013-03-13 Ádám Kallai <kadam@inf.u-szeged.hu>
2		36
3	[Qt] Unreviewed gardening. Unskip now passing compositing tests.	37	[Qt] Unreviewed gardening. Unskip now passing compositing tests.

Line 0 a/LayoutTests/editing/moving/cleanup-on-move-expected.txt_sec1
- a/LayoutTests/editing/moving/cleanup-on-move-expected.txt +37 lines
	1	This test drags a selection of a couple of <li> and drops them after another <li> in the same list. It verifies that no empty <li> (actually with a <br> inside) are left after the moving operation.
	2
	3	The original list looks like this. 'two' and 'three' are going to be selected and pasted after 'four':
	4	\| "
	5	"
	6	\| <li>
	7	\| id="one"
	8	\| "one"
	9	\| <li>
	10	\| id="two"
	11	\| "two"
	12	\| <li>
	13	\| id="three"
	14	\| "three"
	15	\| <li>
	16	\| id="four"
	17	\| "four"
	18	\| "
	19	"
	20
	21	'two' and 'three' should appear as <li> after 'four' and not empty (or with a <br> placeholder) <li> should be there:
	22	\| "
	23	"
	24	\| <li>
	25	\| id="one"
	26	\| "one"
	27	\| <li>
	28	\| id="four"
	29	\| "four"
	30	\| <li>
	31	\| id="two"
	32	\| "two"
	33	\| <li>
	34	\| id="three"
	35	\| "three"
	36	\| "
	37	"

Line 0 a/LayoutTests/editing/moving/cleanup-on-move.html_sec1
- a/LayoutTests/editing/moving/cleanup-on-move.html +22 lines
	1	<!DOCTYPE html>
	2
	3	<body>
	4	<script src="../../resources/dump-as-markup.js"></script>
	5	<script src="resources/select-and-drag.js"></script>
	6	<div contenteditable="true">
	7	<ol id="test">
	8	<li id="one">one</li><li id="two">two</li><li id="three">three</li><li id="four">four</li>
	9	</ol>
	10	</div>
	11
	12	<script>
	13	Markup.description('This test drags a selection of a couple of <li> and drops them after another <li> in the same list. It verifies that no empty <li> (actually with a <br> inside) are left after the moving operation.');
	14
	15	if (window.testRunner) {
	16	Markup.dump("test", "The original list looks like this. 'two' and 'three' are going to be selected and pasted after 'four'");
	17	selectAndDragToTarget("test", "two", "three", 5, "four");
	18	Markup.dump("test", "'two' and 'three' should appear as <li> after 'four' and not empty (or with a <br> placeholder) <li> should be there");
	19	}
	20	</script>
	21	</body>
	22	</html>

Line 0 a/LayoutTests/editing/moving/drag-list-item-expected.txt_sec1
- a/LayoutTests/editing/moving/drag-list-item-expected.txt +65 lines
		1	This test drags a selection of one <li> and drops them after another <li> in the first list. The same test is repeated in the second list but this time with two selected items instead of one. It verifies that the behavior is independent of how many fully selected items we move, i.e. fully selected <li> are moved as <li> and not just as plain text
		2
		3	The original list looks like this. 'two' is going to be selected and pasted after 'four':
		4	\| "
		5	"
		6	\| <li>
		7	\| id="one"
		8	\| "one"
		9	\| <li>
		10	\| id="two"
		11	\| "two"
		12	\| <li>
		13	\| id="three"
		14	\| "three"
		15	\| <li>
		16	\| id="four"
		17	\| "four"
		18	\| "
		19	"
		20
		21	'two' should appear as a new <li> after 'four':
		22	\| "
		23	"
		24	\| <li>
		25	\| id="one"
		26	\| "one"
		27	\| <li>
		28	\| id="three"
		29	\| "three"
		30	\| <li>
		31	\| id="four"
		32	\| "four"
		33	\| <li>
		34	\| id="two"
		35	\| "two"
		36	\| "
		37	"
		38
		39	The original list looks like this. 'two' and 'three' are going to be selected and pasted after 'four':
		40	\| <li>
		41	\| id="one"
		42	\| "one"
		43	\| <li>
		44	\| id="two"
		45	\| "two"
		46	\| <li>
		47	\| id="three"
		48	\| "three"
		49	\| <li>
		50	\| id="four"
		51	\| "four"
		52
		53	'two' and 'three' should appear as <li> after 'four':
		54	\| <li>
		55	\| id="one"
		56	\| "one"
		57	\| <li>
		58	\| id="four"
		59	\| "four"
		60	\| <li>
		61	\| id="two"
		62	\| "two"
		63	\| <li>
		64	\| id="three"
65	\| "three"

Line 0 a/LayoutTests/editing/moving/resources/select-and-drag.js_sec1
- a/LayoutTests/editing/moving/resources/select-and-drag.js +25 lines
	1	function selectAndDragToTarget(testElement, startSelectionElement, endSelectionElement, endSelectionElementOffset, targetElement) {
	2
	3	var testElement = document.getElementById(testElement);
	4	var selection = window.getSelection();
	5	selection.setPosition(testElement, 0);
	6
	7	var start = document.getElementById(startSelectionElement);
	8	var startx = start.offsetLeft;
	9	var starty = start.offsetTop + start.offsetHeight / 2;
	10	selection.setBaseAndExtent(start, 0, document.getElementById(endSelectionElement), endSelectionElementOffset);
	11
	12	eventSender.mouseMoveTo(startx, starty);
	13	eventSender.mouseDown();
	14
	15	eventSender.leapForward(200);
	16
	17	var target = document.getElementById(targetElement);
	18	var targetx = target.parentNode.offsetLeft + target.offsetLeft + target.offsetWidth / 2;
	19	var targety = target.offsetTop + target.offsetHeight / 2;
	20
	21	eventSender.mouseMoveTo(targetx, targety);
	22	eventSender.mouseUp();
	23
	24	selection.collapse();
	25	}

Lines 3-13 Pasting a list item into the middle of another list item should split the target a/LayoutTests/editing/pasteboard/paste-list-004-expected.txt_sec1
- a/LayoutTests/editing/pasteboard/paste-list-004-expected.txt -2 lines
3	one two: one two	3	one two: one two
4	three: three	4	three: three
5	one two: one two	5	one two: one two
6	:
7	four: four	6	four: four
8	monsters walking: <span style="background-color:green"><b>monsters walking</b></span>	7	monsters walking: <span style="background-color:green"><b>monsters walking</b></span>
9	one two: one two	8	one two: one two
10	:
11	cross the floor: <span style="background-color:green"><b>cross the floor</b></span>	9	cross the floor: <span style="background-color:green"><b>cross the floor</b></span>
12	PASS	10	PASS
13		11

Lines 29-36 function editingTest() a/LayoutTests/editing/pasteboard/paste-list-004.html_sec1
- a/LayoutTests/editing/pasteboard/paste-list-004.html -8 / +5 lines
29	pasteCommand();	29	pasteCommand();
30		30
31	// Place the cursor between "walking" and "cross"	31	// Place the cursor between "walking" and "cross"
32	for (var i = 0; i < 2; ++i)	32	moveSelectionForwardByLineCommand();
33	moveSelectionForwardByLineCommand();
34	for (var i = 0; i < 2; ++i)	33	for (var i = 0; i < 2; ++i)
35	moveSelectionForwardByWordCommand();	34	moveSelectionForwardByWordCommand();
36		35
Lines 42-65 function editingTest() a/LayoutTests/editing/pasteboard/paste-list-004.html_sec2
42	"one two",	41	"one two",
43	"three",	42	"three",
44	"one two",	43	"one two",
45	"",
46	"four",	44	"four",
47	"monsters walking",	45	"monsters walking",
48	"one two",	46	"one two",
49	"",
50	"cross the floor"	47	"cross the floor"
51	];	48	];
52	if (listItems.length != 9)	49	if (listItems.length != 7)
53	throw "Expected 8 list items, found " + listItems.length;	50	throw "Expected 7 list items, found " + listItems.length;
54	for (var i = 0; i < results.length; ++i) {	51	for (var i = 0; i < results.length; ++i) {
55	var actual = listItems[i].innerText.replace(/^\s+/g, "");	52	var actual = listItems[i].innerText.replace(/^\s+/g, "");
56	if (results[i] != actual)	53	if (results[i] != actual)
57	throw "Unexpected list item: " + i + "," + results[i] + "," + listItems[i].innerText;	54	throw "Unexpected list item: " + i + "," + results[i] + "," + listItems[i].innerText;
58	}	55	}
59		56
60	// Verify that the cursor is in the right place (on the blank line).	57	// Verify that the cursor is in the right place (at the beginning of 'cross the floor').
61	var selection = window.getSelection();	58	var selection = window.getSelection();
62	if (selection.baseNode != listItems[7] \|\| selection.baseOffset != 0 \|\| !selection.isCollapsed)	59	if (selection.baseNode != listItems[6].firstChild.firstChild.firstChild \|\| selection.baseOffset != 0 \|\| !selection.isCollapsed)
63	throw "Wrong selection position";	60	throw "Wrong selection position";
64		61
65	for (var i = 0; i < listItems.length; ++i) {	62	for (var i = 0; i < listItems.length; ++i) {

Lines 1-71 a/LayoutTests/editing/selection/drag-list-item-expected.txt_sec1
- a/LayoutTests/editing/selection/drag-list-item-expected.txt -71 lines
1	This test drags a selection of one <li> and drops them after another <li> in the first list. The same test is repeated in the second list but this time with two selected items instead of one. It verifies that the behavior is independent of how many fully selected items we move, i.e. fully selected <li> are moved as <li> and not just as plain text
2
3	The original list looks like this. 'two' is going to be selected and pasted after 'four':
4	\| "
5	"
6	\| <li>
7	\| id="one"
8	\| "one"
9	\| <li>
10	\| id="two"
11	\| "two"
12	\| <li>
13	\| id="three"
14	\| "three"
15	\| <li>
16	\| id="four"
17	\| "four"
18	\| "
19	"
20
21	'two' should appear as a new <li> after 'four':
22	\| "
23	"
24	\| <li>
25	\| id="one"
26	\| "one"
27	\| <li>
28	\| id="two"
29	\| <br>
30	\| <li>
31	\| id="three"
32	\| "three"
33	\| <li>
34	\| id="four"
35	\| "four"
36	\| <li>
37	\| id="two"
38	\| "two"
39	\| "
40	"
41
42	The original list looks like this. 'two' and 'three' are going to be selected and pasted after 'four':
43	\| <li>
44	\| id="one"
45	\| "one"
46	\| <li>
47	\| id="two"
48	\| "two"
49	\| <li>
50	\| id="three"
51	\| "three"
52	\| <li>
53	\| id="four"
54	\| "four"
55
56	'two' and 'three' should appear as <li> after 'four':
57	\| <li>
58	\| id="one"
59	\| "one"
60	\| <li>
61	\| id="two"
62	\| <br>
63	\| <li>
64	\| id="four"
65	\| "four"
66	\| <li>
67	\| id="two"
68	\| "two"
69	\| <li>
70	\| id="three"
71	\| "three"

Lines 15-20 a/LayoutTests/platform/mac-wk2/TestExpectations_sec1
- a/LayoutTests/platform/mac-wk2/TestExpectations -1 / +2 lines
15		15
16	# WebKitTestRunner needs an implementation of eventSender	16	# WebKitTestRunner needs an implementation of eventSender
17	# <https://bugs.webkit.org/show_bug.cgi?id=42194>	17	# <https://bugs.webkit.org/show_bug.cgi?id=42194>
		18	editing/moving/cleanup-on-move.html
		19	editing/moving/drag-list-item.html
18	editing/pasteboard/4947130.html	20	editing/pasteboard/4947130.html
19	editing/pasteboard/copy-standalone-image-crash.html	21	editing/pasteboard/copy-standalone-image-crash.html
20	editing/pasteboard/drag-and-drop-image-contenteditable.html	22	editing/pasteboard/drag-and-drop-image-contenteditable.html
Lines 59-65 editing/selection/doubleclick-beside-cr-span.html a/LayoutTests/platform/mac-wk2/TestExpectations_sec2
59	editing/selection/doubleclick-whitespace-crash.html	61	editing/selection/doubleclick-whitespace-crash.html
60	editing/selection/doubleclick-whitespace-img-crash.html	62	editing/selection/doubleclick-whitespace-img-crash.html
61	editing/selection/doubleclick-whitespace.html	63	editing/selection/doubleclick-whitespace.html
62	editing/selection/drag-list-item.html
63	editing/selection/drag-select-1.html	64	editing/selection/drag-select-1.html
64	editing/selection/drag-select-rapidly.html	65	editing/selection/drag-select-rapidly.html
65	editing/selection/drag-start-event-client-x-y.html	66	editing/selection/drag-start-event-client-x-y.html