Changeset 89369 in webkit

Timestamp:

Jun 21, 2011 12:18:11 PM (13 years ago)

Author:

yael.aharon@nokia.com

Message:

2011-06-21 Yael Aharon <​yael.aharon@nokia.com>

Reviewed by Andreas Kling.

[Qt] Regression(60942) wrong default action for drag-and-drop.
​https://bugs.webkit.org/show_bug.cgi?id=63004

Added special handling for the case that dragOperation is not initialized.
Save the last dropOperation and pass it to the dropEvent, so that it can
be accepted by QDrag.
Call event->accepted() and not event->acceptProposedAction(), because the
later ignores the dropAction specified in JavaScript.

Tested with the test page attached to ​https://bugs.webkit.org/show_bug.cgi?id=40401
and did not see any issue.
Also manually tested all combinations of LayoutTests/fast/events/drag-and-drop.html
and they all pass.

• Api/qwebpage.cpp: (dropActionToDragOp): (QWebPagePrivate::dragMoveEvent): (QWebPagePrivate::dropEvent):

Location:

trunk/Source/WebKit/qt

Files:

• Api/qwebpage.cpp (modified) (4 diffs)
• ChangeLog (modified) (1 diff)

trunk/Source/WebKit/qt/Api/qwebpage.cpp

@@ -270 +270 @@
     if (actions & Qt::LinkAction)
         result |= DragOperationLink;
+    if (result == (DragOperationCopy | DragOperationMove | DragOperationGeneric | DragOperationLink))
+        result = DragOperationEvery;
     return (DragOperation)result;
 }
@@ -316 +318 @@
     , inspector(0)
     , inspectorIsInternalOnly(false)
+    , m_lastDropAction(Qt::IgnoreAction)
 {
     WebCore::InitializeLoggingChannelsIfNecessary();
@@ -1016 +1019 @@
     DragData dragData(ev->mimeData(), QPointF(ev->pos()).toPoint(),
             QCursor::pos(), dropActionToDragOp(ev->possibleActions()));
-    Qt::DropAction action = dragOpToDropAction(page->dragController()->dragUpdated(&dragData));
-    ev->setDropAction(action);
-    if (action != Qt::IgnoreAction)
-        ev->acceptProposedAction();
+    m_lastDropAction = dragOpToDropAction(page->dragController()->dragUpdated(&dragData));
+    ev->setDropAction(m_lastDropAction);
+    if (m_lastDropAction != Qt::IgnoreAction)
+        ev->accept();
 #endif
 }
@@ -1029 +1032 @@
     DragData dragData(ev->mimeData(), QPointF(ev->pos()).toPoint(),
             QCursor::pos(), dropActionToDragOp(ev->possibleActions()));
-    if (page->dragController()->performDrag(&dragData))
-        ev->acceptProposedAction();
+    if (page->dragController()->performDrag(&dragData)) {
+        ev->setDropAction(m_lastDropAction);
+        ev->accept();
+    }
 #endif
 }

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-06-21  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Regression(60942) wrong default action for drag-and-drop.
+        https://bugs.webkit.org/show_bug.cgi?id=63004
+
+        Added special handling for the case that dragOperation is not initialized.
+        Save the last dropOperation and pass it to the dropEvent, so that it can 
+        be accepted by QDrag.
+        Call event->accepted() and not event->acceptProposedAction(), because the
+        later ignores the dropAction specified in JavaScript.
+
+        Tested with the test page attached to https://bugs.webkit.org/show_bug.cgi?id=40401
+        and did not see any issue.
+        Also manually tested all combinations of LayoutTests/fast/events/drag-and-drop.html
+        and they all pass.
+
+        * Api/qwebpage.cpp:
+        (dropActionToDragOp):
+        (QWebPagePrivate::dragMoveEvent):
+        (QWebPagePrivate::dropEvent):
+
 2011-06-20  Pavel Feldman  <pfeldman@chromium.org>