Changeset 213638 in webkit

Timestamp:

Mar 9, 2017 6:24:04 AM (7 years ago)

Author:

tpopela@redhat.com

Message:

Correctly process the return value of gdk_drag_context_get_selected_action()

Reviewed by Carlos Garcia Campos.

It returns the action itself and not the bitmask.

• UIProcess/gtk/DragAndDropHandler.cpp:

(WebKit::DragAndDropHandler::drop):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/gtk/DragAndDropHandler.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-03-09  Tomas Popela  <tpopela@redhat.com>
+
+        Correctly process the return value of gdk_drag_context_get_selected_action()
+
+        Reviewed by Carlos Garcia Campos.
+
+        It returns the action itself and not the bitmask.
+
+        * UIProcess/gtk/DragAndDropHandler.cpp:
+        (WebKit::DragAndDropHandler::drop):
+
 2017-03-09  Adrian Perez de Castro  <aperez@igalia.com>
 

trunk/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp

@@ -291 +291 @@
 
     uint32_t flags = 0;
-    if ((gdk_drag_context_get_selected_action(context) & GDK_ACTION_COPY))
+    if (gdk_drag_context_get_selected_action(context) == GDK_ACTION_COPY)
         flags |= WebCore::DragApplicationIsCopyKeyDown;
     DragData dragData(droppingContext->selectionData.ptr(), position, convertWidgetPointToScreenPoint(m_page.viewWidget(), position), gdkDragActionToDragOperation(gdk_drag_context_get_actions(context)), static_cast<WebCore::DragApplicationFlags>(flags));