Merge WebKit at r63173 : Initial merge by git.

Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44

1 files changed, 19 insertions, 0 deletions

diff --git a/WebCore/platform/gtk/ClipboardUtilitiesGtk.cpp b/WebCore/platform/gtk/ClipboardUtilitiesGtk.cpp
index f6dea79..9fc0e74 100644
--- a/WebCore/platform/gtk/ClipboardUtilitiesGtk.cpp
+++ b/WebCore/platform/gtk/ClipboardUtilitiesGtk.cpp
@@ -39,8 +39,27 @@ GdkDragAction dragOperationToGdkDragActions(DragOperation coreAction)
     return gdkAction;
 }
 
+GdkDragAction dragOperationToSingleGdkDragAction(DragOperation coreAction)
+{
+    if (coreAction == DragOperationEvery || coreAction & DragOperationCopy)
+        return GDK_ACTION_COPY;
+    if (coreAction & DragOperationMove)
+        return GDK_ACTION_MOVE;
+    if (coreAction & DragOperationLink)
+        return GDK_ACTION_LINK;
+    if (coreAction & DragOperationPrivate)
+        return GDK_ACTION_PRIVATE;
+    return static_cast<GdkDragAction>(0);
+}
+
 DragOperation gdkDragActionToDragOperation(GdkDragAction gdkAction)
 {
+    // We have no good way to detect DragOperationEvery other than
+    // to use it when all applicable flags are on.
+    if (gdkAction & GDK_ACTION_COPY && gdkAction & GDK_ACTION_MOVE
+        && gdkAction & GDK_ACTION_LINK && gdkAction & GDK_ACTION_PRIVATE)
+        return DragOperationEvery;
+
     unsigned int action = DragOperationNone;
     if (gdkAction & GDK_ACTION_COPY)
         action |= DragOperationCopy;