Changeset 237986 in webkit

Timestamp:

Nov 8, 2018 7:36:05 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Plain text drag in contenteditable is always DragOperationCopy, never DragOperationMove
​https://bugs.webkit.org/show_bug.cgi?id=191228
<rdar://problem/45786830>

Patch by Jonathan Hammer <​jonathan@e3software.com> on 2018-11-08
Reviewed by Wenson Hsieh.

Source/WebCore:

DragController::beginDrag should not call cleanupAfterSystemDrag because
the drag is still in progress even after the call to m_client.beginDrag()
returns. This is in contrast to DragController::doSystemDrag, where the
call to cleanupAfterSystemDrag is appropriate because the drag has
concluded by the time m_client.startDrag() returns.

Test: fast/events/drag-and-drop-move-not-copy.html

• page/DragController.cpp:

(WebCore::DragController::beginDrag):

LayoutTests:

A test that checks that dragging plain text in a contenteditable element results
in the text being moved and not copied. Only applies to WK1. Test skipped on
WK2 because WK2 EventSender does not support drag events. Test also skipped on
AppleWin because drag and drop doesn't work correctly in DRT (according to the
TestExpectations file).

• fast/events/drag-and-drop-move-not-copy-expected.txt: Added.
• fast/events/drag-and-drop-move-not-copy.html: Added.
• platform/win/TestExpectations:
• platform/wk2/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/drag-and-drop-move-not-copy-expected.txt (added)
• LayoutTests/fast/events/drag-and-drop-move-not-copy.html (added)
• LayoutTests/platform/win/TestExpectations (modified) (1 diff)
• LayoutTests/platform/wk2/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/DragController.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-11-08  Jonathan Hammer  <jonathan@e3software.com>
+
+        Plain text drag in contenteditable is always DragOperationCopy, never DragOperationMove
+        https://bugs.webkit.org/show_bug.cgi?id=191228
+        <rdar://problem/45786830>
+
+        Reviewed by Wenson Hsieh.
+
+        A test that checks that dragging plain text in a contenteditable element results
+        in the text being moved and not copied. Only applies to WK1. Test skipped on
+        WK2 because WK2 EventSender does not support drag events. Test also skipped on 
+        AppleWin because drag and drop doesn't work correctly in DRT (according to the 
+        TestExpectations file).
+
+        * fast/events/drag-and-drop-move-not-copy-expected.txt: Added.
+        * fast/events/drag-and-drop-move-not-copy.html: Added.
+        * platform/win/TestExpectations:
+        * platform/wk2/TestExpectations:
+
 2018-11-08  Alicia Boya García  <aboya@igalia.com>
 

trunk/LayoutTests/platform/win/TestExpectations

@@ -174 +174 @@
 fast/events/standalone-image-drag-to-editable.html [ Skip ]
 fast/events/drag-and-drop-autoscroll-inner-frame.html [ Skip ]
+fast/events/drag-and-drop-move-not-copy.html [ Skip ]
 http/tests/security/clipboard/clipboard-file-access.html [ Skip ]
 http/tests/security/drag-drop-same-unique-origin.html [ Skip ]

trunk/LayoutTests/platform/wk2/TestExpectations

@@ -177 +177 @@
 # eventSender.dragMode is unimplemented in WKTR
 # Mac: https://bugs.webkit.org/show_bug.cgi?id=68552
+fast/events/drag-and-drop-move-not-copy.html
 fast/events/controlclick-no-onclick.html
 fast/events/moving-text-should-fire-drop-and-dragend-events.html

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-11-08  Jonathan Hammer  <jonathan@e3software.com>
+
+        Plain text drag in contenteditable is always DragOperationCopy, never DragOperationMove
+        https://bugs.webkit.org/show_bug.cgi?id=191228
+        <rdar://problem/45786830>
+
+        Reviewed by Wenson Hsieh.
+
+        DragController::beginDrag should not call cleanupAfterSystemDrag because
+        the drag is still in progress even after the call to m_client.beginDrag()
+        returns. This is in contrast to DragController::doSystemDrag, where the
+        call to cleanupAfterSystemDrag is appropriate because the drag has
+        concluded by the time m_client.startDrag() returns.
+
+        Test: fast/events/drag-and-drop-move-not-copy.html
+
+        * page/DragController.cpp:
+        (WebCore::DragController::beginDrag):
+
 2018-11-08  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/page/DragController.cpp

@@ -1254 +1254 @@
 
     m_client.beginDrag(WTFMove(dragItem), frame, mouseDownPointInRootViewCoordinates, mouseDraggedPointInRootViewCoordinates, dataTransfer, dragSourceAction);
-
-    // DragClient::beginDrag can cause the drag controller to be deleted.
-    if (!mainFrameProtector->page())
-        return;
-
-    // FIXME: This shouldn't be needed.
-    cleanupAfterSystemDrag();
 }