Changeset 56513 in webkit

Timestamp:

Mar 25, 2010 1:46:28 AM (14 years ago)

Author:

tony@chromium.org

Message:

2010-03-25 Tony Chang <​tony@chromium.org>

Reviewed by Eric Seidel.

​https://bugs.webkit.org/show_bug.cgi?id=33697
Have dragOpFromIEOp("move") return DragOperationGeneric | DragOperationMove
because only returning Generic doesn't work for platforms that don't
have a generic operation.

Covered by existing tests (fast/events/drag-and-drop.html).

• dom/Clipboard.cpp: (WebCore::dragOpFromIEOp): (WebCore::Clipboard::destinationOperation): (WebCore::Clipboard::setDestinationOperation):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Clipboard.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-25  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        https://bugs.webkit.org/show_bug.cgi?id=33697
+        Have dragOpFromIEOp("move") return DragOperationGeneric | DragOperationMove
+        because only returning Generic doesn't work for platforms that don't
+        have a generic operation.
+
+        Covered by existing tests (fast/events/drag-and-drop.html).
+
+        * dom/Clipboard.cpp:
+        (WebCore::dragOpFromIEOp):
+        (WebCore::Clipboard::destinationOperation):
+        (WebCore::Clipboard::setDestinationOperation):
+
 2010-03-25  Fumitoshi Ukai  <ukai@chromium.org>
 

trunk/WebCore/dom/Clipboard.cpp

@@ -66 +66 @@
         return DragOperationLink;
     if (op == "move")
-        return DragOperationGeneric;    // FIXME: Why is this DragOperationGeneric? <http://webkit.org/b/33697>
+        return (DragOperation)(DragOperationGeneric | DragOperationMove);
     if (op == "copyLink")
         return (DragOperation)(DragOperationCopy | DragOperationLink);
@@ -110 +110 @@
 {
     DragOperation op = dragOpFromIEOp(m_dropEffect);
-    ASSERT(op == DragOperationCopy || op == DragOperationNone || op == DragOperationLink || op == DragOperationGeneric || op == DragOperationMove || op == DragOperationEvery);
+    ASSERT(op == DragOperationCopy || op == DragOperationNone || op == DragOperationLink || op == (DragOperation)(DragOperationGeneric | DragOperationMove) || op == DragOperationEvery);
     return op;
 }
@@ -122 +122 @@
 void Clipboard::setDestinationOperation(DragOperation op)
 {
-    ASSERT_ARG(op, op == DragOperationCopy || op == DragOperationNone || op == DragOperationLink || op == DragOperationGeneric || op == DragOperationMove);
+    ASSERT_ARG(op, op == DragOperationCopy || op == DragOperationNone || op == DragOperationLink || op == DragOperationGeneric || op == DragOperationMove || op == (DragOperation)(DragOperationGeneric | DragOperationMove));
     m_dropEffect = IEOpFromDragOp(op);
 }