Attachment 191725 Details for Bug 110610 – Patch

[patch] Patch

bug-110610-20130306141824.patch (text/plain), 7.26 KB, created by Sergio Villar Senin on 2013-03-06 05:23:49 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Sergio Villar Senin

Created: 2013-03-06 05:23:49 PST

Size: 7.26 KB

patch

obsolete

>Subversion Revision: 144901
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 3f03a436870f2048eb4a66b299d4d36d4cfc7efb..75fc49ac0165b98d09c58e02a0e53ac501e56ff1 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,5 +1,18 @@
> 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
> 
>diff --git a/Source/WebCore/editing/MoveSelectionCommand.cpp b/Source/WebCore/editing/MoveSelectionCommand.cpp
>index 5a2143c63d450555cef3980b79438f459dcfa134..475282ecd48c92815551ebbb47fa535e360884c3 100644
>--- a/Source/WebCore/editing/MoveSelectionCommand.cpp
>+++ b/Source/WebCore/editing/MoveSelectionCommand.cpp
>@@ -65,6 +65,8 @@ void MoveSelectionCommand::doApply()
>     if (!pos.anchorNode()->inDocument())
>         pos = endingSelection().start();
> 
>+    cleanupAfterDeletion(pos);
>+
>     setEndingSelection(VisibleSelection(pos, endingSelection().affinity(), endingSelection().isDirectional()));
>     if (!pos.anchorNode()->inDocument()) {
>         // Document was modified out from under us.
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 1b9aec37838efdd24d6a8f6c0779d54f2d2065b4..cc6d140cc2b7bd9b90fbb7ab52c906e01cfb61d3 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,5 +1,18 @@
> 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
> 
>diff --git a/LayoutTests/editing/selection/4895428-1-expected.txt b/LayoutTests/editing/selection/4895428-1-expected.txt
>index e83b06b1718c2c6db825fe2efb19196362046cfb..1e932294d2828fe3d22c6ea1e079344ead24120e 100644
>--- a/LayoutTests/editing/selection/4895428-1-expected.txt
>+++ b/LayoutTests/editing/selection/4895428-1-expected.txt
>@@ -5,7 +5,6 @@ This tests dragging a selected table by mousing down on the contents of one of i
> |   contenteditable="true"
> |   id="source"
> |   style="border: 1px solid blue;"
>-|   <br>
> | "
> "
> | <div>
>diff --git a/LayoutTests/editing/selection/4895428-4-expected.txt b/LayoutTests/editing/selection/4895428-4-expected.txt
>index a2a53879113ed05039b125e449587b38c26f25e3..0eb9e4733808123afccda09b09558d6e66f17f1f 100644
>--- a/LayoutTests/editing/selection/4895428-4-expected.txt
>+++ b/LayoutTests/editing/selection/4895428-4-expected.txt
>@@ -7,7 +7,6 @@ This tests to see if an editable selection containing a focusable node is dragga
> |   style="border: 1px solid blue;"
> |   "
> "
>-|   <br>
> |   "
> "
> | "
>diff --git a/LayoutTests/editing/selection/drag-list-item-expected.txt b/LayoutTests/editing/selection/drag-list-item-expected.txt
>index 81c1fcf9788d10426d1be48118752422c82a92a4..205b5097bd4ab19f35b5f012793c545c571da8b3 100644
>--- a/LayoutTests/editing/selection/drag-list-item-expected.txt
>+++ b/LayoutTests/editing/selection/drag-list-item-expected.txt
>@@ -3,49 +3,43 @@ layer at (0,0) size 800x600
> 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 800x230
>+      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 800x90
>+        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,54) size 760x18
>-            RenderListMarker at (-21,0) size 16x19: "4"
>+          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,72) size 760x18
>-            RenderListMarker at (-21,0) size 16x19: "5"
>+          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,140) size 800x90
>+        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,54) size 760x18
>-            RenderListMarker at (-21,0) size 16x19: "4"
>+          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,72) size 760x18
>-            RenderListMarker at (-21,0) size 16x19: "5"
>+          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 6 {LI} of child 5 {OL} of child 1 {DIV} of body
>-selection end:   position 5 of child 0 {#text} of child 7 {LI} of child 5 {OL} of child 1 {DIV} of body
>+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

Actions: View | Formatted Diff | Diff

Attachments on bug 110610: 190972 | 191725 | 192021 | 192036 | 192182 | 192431 | 192894 | 192897 | 193092