Changeset 49268 in webkit

Timestamp:

Oct 7, 2009 3:26:48 PM (15 years ago)

Author:

dbates@webkit.org

Message:

2009-10-07 Daniel Bates <​dbates@webkit.org>

Reviewed by Darin Adler.

​https://bugs.webkit.org/show_bug.cgi?id=30102
And
<rdar://problem/5015957>

Fixes an issue (in the Windows build) where the cursor does not change to the
not-allowed cursor when the drag-and-drop operation is not allowed.

The allowed effects in WebDragClient::startDrag are hard-coded to be
DROPEFFECT_COPY | DROPEFFECT_LINK | DROPEFFECT_MOVE. Instead, the list of
allowed drop effects should be determined by the allowed operations of the
drag source.

We cannot test this using DRT because DRT looks at the programmatic drop
cursor and until bug #24731 is fixed this value is hard-coded to DragOperationCopy.
That is, there is a discrepancy in the Windows build between the Windows API-based
drop effect and the WebKit drop effect. Because DRT cannot read the screen buffer
to determine the cursor, a manual test is needed.

• WebCoreSupport/WebDragClient.cpp: (draggingSourceOperationMaskToDragCursors): Added method. (WebDragClient::startDrag):

2009-10-07 Daniel Bates <​dbates@webkit.org>

Reviewed by Darin Adler.

​https://bugs.webkit.org/show_bug.cgi?id=30102
And
<rdar://problem/5015957>

Manual test to confirm that the not-allowed cursor is shown for an
invalid drag-and-drop operation.

We cannot test this using DRT because of a discrepancy between the Windows
API-based drop effect and the WebKit drop effect. See bug #24731 for more
details.

• manual-tests/drag-cursor-notallowed.html: Added.

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/manual-tests/drag-cursor-notallowed.html (added)
• WebKit/win/ChangeLog (modified) (1 diff)
• WebKit/win/WebCoreSupport/WebDragClient.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-10-07  Daniel Bates  <dbates@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30102
+        And
+        <rdar://problem/5015957>
+        
+        Manual test to confirm that the not-allowed cursor is shown for an
+        invalid drag-and-drop operation.
+        
+        We cannot test this using DRT because of a discrepancy between the Windows
+        API-based drop effect and the WebKit drop effect. See bug #24731 for more
+        details.
+
+        * manual-tests/drag-cursor-notallowed.html: Added.
+
 2009-10-07  Mark Rowe  <mrowe@apple.com>
 

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2009-10-07  Daniel Bates  <dbates@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30102
+        And
+        <rdar://problem/5015957>
+        
+        Fixes an issue (in the Windows build) where the cursor does not change to the
+        not-allowed cursor when the drag-and-drop operation is not allowed.
+        
+        The allowed effects in WebDragClient::startDrag are hard-coded to be 
+        DROPEFFECT_COPY | DROPEFFECT_LINK | DROPEFFECT_MOVE. Instead, the list of 
+        allowed drop effects should be determined by the allowed operations of the
+        drag source.
+        
+        We cannot test this using DRT because DRT looks at the programmatic drop 
+        cursor and until bug #24731 is fixed this value is hard-coded to DragOperationCopy.
+        That is, there is a discrepancy in the Windows build between the Windows API-based 
+        drop effect and the WebKit drop effect. Because DRT cannot read the screen buffer 
+        to determine the cursor, a manual test is needed.
+
+        * WebCoreSupport/WebDragClient.cpp:
+        (draggingSourceOperationMaskToDragCursors): Added method.
+        (WebDragClient::startDrag):
+
 2009-10-07  Steve Falkenburg  <sfalken@apple.com>
 

trunk/WebKit/win/WebCoreSupport/WebDragClient.cpp

@@ -34 +34 @@
 #pragma warning(push, 0) 
 #include <WebCore/ClipboardWin.h>
+#include <WebCore/DragController.h>
 #include <WebCore/DragData.h>
 #include <WebCore/Font.h>
@@ -68 +69 @@
 
 using namespace WebCore;
+
+static DWORD draggingSourceOperationMaskToDragCursors(DragOperation op)
+{
+    DWORD result = DROPEFFECT_NONE;
+    if (op == DragOperationEvery)
+        return DROPEFFECT_COPY | DROPEFFECT_LINK | DROPEFFECT_MOVE; 
+    if (op & DragOperationCopy)
+        result |= DROPEFFECT_COPY; 
+    if (op & DragOperationLink)
+        result |= DROPEFFECT_LINK; 
+    if (op & DragOperationMove)
+        result |= DROPEFFECT_MOVE;
+    if (op & DragOperationGeneric)
+        result |= DROPEFFECT_MOVE;
+    return result;
+}
 
 WebDragClient::WebDragClient(WebView* webView)
@@ -155 +172 @@
         }
 
-        //FIXME: Ensure correct drag ops are available <rdar://problem/5015957>
-        DWORD okEffect = DROPEFFECT_COPY | DROPEFFECT_LINK | DROPEFFECT_MOVE;
+        DWORD okEffect = draggingSourceOperationMaskToDragCursors(m_webView->page()->dragController()->sourceDragOperation());
         DWORD effect;
         COMPtr<IWebUIDelegate> ui;