Title: [215022] releases/WebKitGTK/webkit-2.14/Source/WebKit2
- Revision
- 215022
- Author
- carlo...@webkit.org
- Date
- 2017-04-06 05:33:31 -0700 (Thu, 06 Apr 2017)
Log Message
Merge r213638 - 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):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog (215021 => 215022)
--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2017-04-06 12:33:22 UTC (rev 215021)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2017-04-06 12:33:31 UTC (rev 215022)
@@ -1,3 +1,14 @@
+2017-03-09 Tomas Popela <tpop...@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-02-23 Tomas Popela <tpop...@redhat.com>
[GTK] Drag and drop is always moving the content even if copy is requested
Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp (215021 => 215022)
--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp 2017-04-06 12:33:22 UTC (rev 215021)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp 2017-04-06 12:33:31 UTC (rev 215022)
@@ -290,7 +290,7 @@
droppingContext->dropHappened = true;
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));
SandboxExtension::Handle handle;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
