Attachment #191725 for bug #110610

View Details Raw Unified Return to Bug 110610

| Differences between



2013-03-06  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
        invalid placeholders left by the editing algorithms.

        * editing/MoveSelectionCommand.cpp:
        (WebCore::MoveSelectionCommand::doApply):

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

        Improve drag&drop of list items in contentEditable divs
        https://bugs.webkit.org/show_bug.cgi?id=111556


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.



2013-03-06  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.

        * editing/selection/4895428-1-expected.txt: removed a <br>.
        * editing/selection/4895428-4-expected.txt: ditto.

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

        Improve drag&drop of list items in contentEditable divs
        https://bugs.webkit.org/show_bug.cgi?id=111556


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	\| "



layer at (0,0) size 800x600
  RenderBlock {HTML} at (0,0) size 800x600
    RenderBody {BODY} at (0,0) size 800x584
      RenderBlock {DIV} at (0,0) size 800x194
        RenderBlock {P} at (0,0) size 800x18
          RenderText {#text} at (0,0) size 549x19
            text run at (0,0) width 549: "Drag'Drop list items in a list. This test should be run with DRT for event sender access."
        RenderBlock {OL} at (0,34) size 800x72
          RenderListItem {LI} at (40,0) size 760x18
            RenderListMarker at (-21,0) size 16x19: "1"
            RenderText {#text} at (0,0) size 34x19
              text run at (0,0) width 34: "alpha"
          RenderListItem {LI} at (40,18) size 760x18
            RenderListMarker at (-21,0) size 16x19: "2"
            RenderBR {BR} at (0,0) size 0x19
          RenderListItem {LI} at (40,36) size 760x18
            RenderListMarker at (-21,0) size 16x19: "3"
            RenderText {#text} at (0,0) size 46x19
              text run at (0,0) width 46: "gamma"
          RenderListItem {LI} at (40,36) size 760x18
            RenderListMarker at (-21,0) size 16x19: "3"
            RenderText {#text} at (0,0) size 30x19
              text run at (0,0) width 30: "delta"
          RenderListItem {LI} at (40,54) size 760x18
            RenderListMarker at (-21,0) size 16x19: "4"
            RenderText {#text} at (0,0) size 26x19
              text run at (0,0) width 26: "beta"
        RenderBlock {OL} at (0,122) size 800x72
          RenderListItem {LI} at (40,0) size 760x18
            RenderListMarker at (-21,0) size 16x19: "1"
            RenderText {#text} at (0,0) size 34x19
              text run at (0,0) width 34: "alpha"
          RenderListItem {LI} at (40,18) size 760x18
            RenderListMarker at (-21,0) size 16x19: "2"
            RenderBR {BR} at (0,0) size 0x19
          RenderListItem {LI} at (40,36) size 760x18
            RenderListMarker at (-21,0) size 16x19: "3"
            RenderText {#text} at (0,0) size 30x19
              text run at (0,0) width 30: "delta"
          RenderListItem {LI} at (40,36) size 760x18
            RenderListMarker at (-21,0) size 16x19: "3"
            RenderText {#text} at (0,0) size 26x19
              text run at (0,0) width 26: "beta"
          RenderListItem {LI} at (40,54) size 760x18
            RenderListMarker at (-21,0) size 16x19: "4"
            RenderText {#text} at (0,0) size 46x19
              text run at (0,0) width 46: "gamma"
selection start: position 0 of child 0 {#text} of child 5 {LI} of child 5 {OL} of child 1 {DIV} of body
selection end:   position 5 of child 0 {#text} of child 6 {LI} of child 5 {OL} of child 1 {DIV} of body

Return to Bug 110610

Lines 1-5 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +13 lines
1	2013-03-06 Sergio Villar Senin <svillar@igalia.com>	1	2013-03-06 Sergio Villar Senin <svillar@igalia.com>
2		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	invalid placeholders left by the editing algorithms.
		10
		11	* editing/MoveSelectionCommand.cpp:
		12	(WebCore::MoveSelectionCommand::doApply):
		13
		14	2013-03-06 Sergio Villar Senin <svillar@igalia.com>
		15
3	Improve drag&drop of list items in contentEditable divs	16	Improve drag&drop of list items in contentEditable divs
4	https://bugs.webkit.org/show_bug.cgi?id=111556	17	https://bugs.webkit.org/show_bug.cgi?id=111556
5		18

Lines 1-5 a/LayoutTests/ChangeLog_sec1
- a/LayoutTests/ChangeLog +13 lines
1	2013-03-06 Sergio Villar Senin <svillar@igalia.com>	1	2013-03-06 Sergio Villar Senin <svillar@igalia.com>
2		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.
		10
		11	* editing/selection/4895428-1-expected.txt: removed a <br>.
		12	* editing/selection/4895428-4-expected.txt: ditto.
		13
		14	2013-03-06 Sergio Villar Senin <svillar@igalia.com>
		15
3	Improve drag&drop of list items in contentEditable divs	16	Improve drag&drop of list items in contentEditable divs
4	https://bugs.webkit.org/show_bug.cgi?id=111556	17	https://bugs.webkit.org/show_bug.cgi?id=111556
5		18

Lines 3-51 layer at (0,0) size 800x600 a/LayoutTests/editing/selection/drag-list-item-expected.txt_sec1
- a/LayoutTests/editing/selection/drag-list-item-expected.txt -19 / +13 lines
3	layer at (0,0) size 800x600	3	layer at (0,0) size 800x600
4	RenderBlock {HTML} at (0,0) size 800x600	4	RenderBlock {HTML} at (0,0) size 800x600
5	RenderBody {BODY} at (0,0) size 800x584	5	RenderBody {BODY} at (0,0) size 800x584
6	RenderBlock {DIV} at (0,0) size 800x230	6	RenderBlock {DIV} at (0,0) size 800x194
7	RenderBlock {P} at (0,0) size 800x18	7	RenderBlock {P} at (0,0) size 800x18
8	RenderText {#text} at (0,0) size 549x19	8	RenderText {#text} at (0,0) size 549x19
9	text run at (0,0) width 549: "Drag'Drop list items in a list. This test should be run with DRT for event sender access."	9	text run at (0,0) width 549: "Drag'Drop list items in a list. This test should be run with DRT for event sender access."
10	RenderBlock {OL} at (0,34) size 800x90	10	RenderBlock {OL} at (0,34) size 800x72
11	RenderListItem {LI} at (40,0) size 760x18	11	RenderListItem {LI} at (40,0) size 760x18
12	RenderListMarker at (-21,0) size 16x19: "1"	12	RenderListMarker at (-21,0) size 16x19: "1"
13	RenderText {#text} at (0,0) size 34x19	13	RenderText {#text} at (0,0) size 34x19
14	text run at (0,0) width 34: "alpha"	14	text run at (0,0) width 34: "alpha"
15	RenderListItem {LI} at (40,18) size 760x18	15	RenderListItem {LI} at (40,18) size 760x18
16	RenderListMarker at (-21,0) size 16x19: "2"	16	RenderListMarker at (-21,0) size 16x19: "2"
17	RenderBR {BR} at (0,0) size 0x19
18	RenderListItem {LI} at (40,36) size 760x18
19	RenderListMarker at (-21,0) size 16x19: "3"
20	RenderText {#text} at (0,0) size 46x19	17	RenderText {#text} at (0,0) size 46x19
21	text run at (0,0) width 46: "gamma"	18	text run at (0,0) width 46: "gamma"
22	RenderListItem {LI} at (40,54) size 760x18	19	RenderListItem {LI} at (40,36) size 760x18
23	RenderListMarker at (-21,0) size 16x19: "4"	20	RenderListMarker at (-21,0) size 16x19: "3"
24	RenderText {#text} at (0,0) size 30x19	21	RenderText {#text} at (0,0) size 30x19
25	text run at (0,0) width 30: "delta"	22	text run at (0,0) width 30: "delta"
26	RenderListItem {LI} at (40,72) size 760x18	23	RenderListItem {LI} at (40,54) size 760x18
27	RenderListMarker at (-21,0) size 16x19: "5"	24	RenderListMarker at (-21,0) size 16x19: "4"
28	RenderText {#text} at (0,0) size 26x19	25	RenderText {#text} at (0,0) size 26x19
29	text run at (0,0) width 26: "beta"	26	text run at (0,0) width 26: "beta"
30	RenderBlock {OL} at (0,140) size 800x90	27	RenderBlock {OL} at (0,122) size 800x72
31	RenderListItem {LI} at (40,0) size 760x18	28	RenderListItem {LI} at (40,0) size 760x18
32	RenderListMarker at (-21,0) size 16x19: "1"	29	RenderListMarker at (-21,0) size 16x19: "1"
33	RenderText {#text} at (0,0) size 34x19	30	RenderText {#text} at (0,0) size 34x19
34	text run at (0,0) width 34: "alpha"	31	text run at (0,0) width 34: "alpha"
35	RenderListItem {LI} at (40,18) size 760x18	32	RenderListItem {LI} at (40,18) size 760x18
36	RenderListMarker at (-21,0) size 16x19: "2"	33	RenderListMarker at (-21,0) size 16x19: "2"
37	RenderBR {BR} at (0,0) size 0x19
38	RenderListItem {LI} at (40,36) size 760x18
39	RenderListMarker at (-21,0) size 16x19: "3"
40	RenderText {#text} at (0,0) size 30x19	34	RenderText {#text} at (0,0) size 30x19
41	text run at (0,0) width 30: "delta"	35	text run at (0,0) width 30: "delta"
42	RenderListItem {LI} at (40,54) size 760x18	36	RenderListItem {LI} at (40,36) size 760x18
43	RenderListMarker at (-21,0) size 16x19: "4"	37	RenderListMarker at (-21,0) size 16x19: "3"
44	RenderText {#text} at (0,0) size 26x19	38	RenderText {#text} at (0,0) size 26x19
45	text run at (0,0) width 26: "beta"	39	text run at (0,0) width 26: "beta"
46	RenderListItem {LI} at (40,72) size 760x18	40	RenderListItem {LI} at (40,54) size 760x18
47	RenderListMarker at (-21,0) size 16x19: "5"	41	RenderListMarker at (-21,0) size 16x19: "4"
48	RenderText {#text} at (0,0) size 46x19	42	RenderText {#text} at (0,0) size 46x19
49	text run at (0,0) width 46: "gamma"	43	text run at (0,0) width 46: "gamma"
50	selection start: position 0 of child 0 {#text} of child 6 {LI} of child 5 {OL} of child 1 {DIV} of body	44	selection start: position 0 of child 0 {#text} of child 5 {LI} of child 5 {OL} of child 1 {DIV} of body
51	selection end: position 5 of child 0 {#text} of child 7 {LI} of child 5 {OL} of child 1 {DIV} of body	45	selection end: position 5 of child 0 {#text} of child 6 {LI} of child 5 {OL} of child 1 {DIV} of body