Changeset 49203 in webkit

Timestamp:

Oct 6, 2009 12:14:39 PM (15 years ago)

Author:

dbates@webkit.org

Message:

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

Reviewed by Eric Seidel.

​https://bugs.webkit.org/show_bug.cgi?id=30107

Fixes an issue where the Mac build does return the correct drop effect
with respect to the HTML 5 specification when effectAllowed == "none".

Currently, when effectAllowed == "none" and dropEffect == "copy" or
dropEffect == "move" the resulting drop effect is "copy" and "move",
respectively. However, the HTML 5 specification states that regardless
of the specified dropEffect, when effectAllowed == "none" the resulting
drop effect should be "none".

• WebView/WebHTMLView.mm: (-[WebHTMLView draggingSourceOperationMaskForLocal:]):

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

Reviewed by Eric Seidel.

​https://bugs.webkit.org/show_bug.cgi?id=30107

Tests that drag-and-drop returns dropEffect = "none" when
effectAllowed == "none", regardless of the user-specified
drop effect.

• fast/events/drag-and-drop-none-expected.txt: Added.
• fast/events/drag-and-drop-none.html: Added.
• platform/win/Skipped: This test does not work under Windows. We need the fix for bug #24731.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/drag-and-drop-none-expected.txt (added)
• LayoutTests/fast/events/drag-and-drop-none.html (added)
• LayoutTests/platform/win/Skipped (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebHTMLView.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-10-06  Daniel Bates  <dbates@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30107
+        
+        Tests that drag-and-drop returns dropEffect = "none" when 
+        effectAllowed == "none", regardless of the user-specified
+        drop effect.
+
+        * fast/events/drag-and-drop-none-expected.txt: Added.
+        * fast/events/drag-and-drop-none.html: Added.
+        * platform/win/Skipped: This test does not work under 
+        Windows. We need the fix for bug #24731.
+
 2009-10-06  Kent Tamura  <tkent@chromium.org>
 

trunk/LayoutTests/platform/win/Skipped

@@ -105 +105 @@
 fast/events/drag-in-frames.html
 fast/events/standalone-image-drag-to-editable.html
+
+# Windows drag-and-drop does not work correctly (https://bugs.webkit.org/show_bug.cgi?id=24731)
+fast/events/drag-and-drop-none.html
 
 # <rdar://problem/5643675> window.scrollTo scrolls a window with no scrollbars

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2009-10-06  Daniel Bates  <dbates@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30107
+        
+        Fixes an issue where the Mac build does return the correct drop effect
+        with respect to the HTML 5 specification when effectAllowed == "none".
+        
+        Currently, when effectAllowed == "none" and dropEffect == "copy" or 
+        dropEffect == "move" the resulting drop effect is "copy" and "move",
+        respectively. However, the HTML 5 specification states that regardless
+        of the specified dropEffect, when effectAllowed == "none" the resulting
+        drop effect should be "none".
+
+        * WebView/WebHTMLView.mm:
+        (-[WebHTMLView draggingSourceOperationMaskForLocal:]):
+
 2009-10-06  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/WebKit/mac/WebView/WebHTMLView.mm

@@ -3426 +3426 @@
         return NSDragOperationNone;
 
-    // FIXME: Why do we override the source provided operation here?  Why not in DragController::startDrag
-    if (page->dragController()->sourceDragOperation() == DragOperationNone)
-        return NSDragOperationGeneric | NSDragOperationCopy;
-
     return (NSDragOperation)page->dragController()->sourceDragOperation();
 }