Changeset 60008 in webkit

Timestamp:

May 22, 2010 11:14:29 AM (14 years ago)

Author:

Martin Robinson

Message:

2010-05-22 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[GTK] WebKit/gtk/WebCoreSupport/DragClientGtk::startDrag should use the Clipboard::sourceOperation
​https://bugs.webkit.org/show_bug.cgi?id=39459

Add ClipboardUtilitiesGtk, a container for GTK+/WebCore clipboard utility functions.
Initially add a function which converts a WebCore::DragOperation to a bitmask of
GdkDragActions.

No new tests, because behavior has not changed.

• GNUmakefile.am:
• platform/gtk/ClipboardUtilitiesGtk.cpp: Added. (WebCore::dragOperationToGdkDragActions): Added.
• platform/gtk/ClipboardUtilitiesGtk.h: Added.

2010-05-22 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[GTK] WebKit/gtk/WebCoreSupport/DragClientGtk::startDrag should use the Clipboard::sourceOperation
​https://bugs.webkit.org/show_bug.cgi?id=39459

• WebCoreSupport/DragClientGtk.cpp: (WebKit::DragClient::startDrag): Use Clipboard::sourceOperation instead of trying to figure out the GdkDragAction manually. The DOM may have changed the appropriate list of actions anyhow.

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/GNUmakefile.am (modified) (1 diff)
• WebCore/platform/gtk/ClipboardUtilitiesGtk.cpp (added)
• WebCore/platform/gtk/ClipboardUtilitiesGtk.h (added)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/WebCoreSupport/DragClientGtk.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-05-22  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] WebKit/gtk/WebCoreSupport/DragClientGtk::startDrag should use the Clipboard::sourceOperation
+        https://bugs.webkit.org/show_bug.cgi?id=39459
+
+        Add ClipboardUtilitiesGtk, a container for GTK+/WebCore clipboard utility functions.
+        Initially add a function which converts a WebCore::DragOperation to a bitmask of
+        GdkDragActions.
+
+        No new tests, because behavior has not changed.
+
+        * GNUmakefile.am:
+        * platform/gtk/ClipboardUtilitiesGtk.cpp: Added.
+        (WebCore::dragOperationToGdkDragActions): Added.
+        * platform/gtk/ClipboardUtilitiesGtk.h: Added.
+
 2010-05-21  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/GNUmakefile.am

@@ -2110 +2110 @@
         WebCore/platform/gtk/ClipboardGtk.cpp \
         WebCore/platform/gtk/ClipboardGtk.h \
+        WebCore/platform/gtk/ClipboardUtilitiesGtk.cpp \
+        WebCore/platform/gtk/ClipboardUtilitiesGtk.h \
         WebCore/platform/gtk/ContextMenuGtk.cpp \
         WebCore/platform/gtk/ContextMenuItemGtk.cpp \

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2010-05-22  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] WebKit/gtk/WebCoreSupport/DragClientGtk::startDrag should use the Clipboard::sourceOperation
+        https://bugs.webkit.org/show_bug.cgi?id=39459
+
+        * WebCoreSupport/DragClientGtk.cpp:
+        (WebKit::DragClient::startDrag):
+        Use Clipboard::sourceOperation instead of trying to figure out the GdkDragAction
+        manually. The DOM may have changed the appropriate list of actions anyhow.
+
 2010-05-21  Steve Block  <steveblock@google.com>
 

trunk/WebKit/gtk/WebCoreSupport/DragClientGtk.cpp

@@ -21 +21 @@
 
 #include "ClipboardGtk.h"
+#include "ClipboardUtilitiesGtk.h"
 #include "DataObjectGtk.h"
 #include "Document.h"
+#include "DragController.h"
 #include "Element.h"
 #include "Frame.h"
@@ -72 +74 @@
     ClipboardGtk* clipboardGtk = reinterpret_cast<ClipboardGtk*>(clipboard);
 
-    GdkDragAction dragAction = GDK_ACTION_COPY;
-    if (linkDrag)
-        dragAction = (GdkDragAction) (dragAction | GDK_ACTION_LINK);
-
     WebKitWebView* webView = webkit_web_frame_get_web_view(kit(frame));
     RefPtr<DataObjectGtk> dataObject = clipboardGtk->dataObject();
@@ -85 +83 @@
     event->button.time = GDK_CURRENT_TIME;
 
-    GdkDragContext* context = gtk_drag_begin(GTK_WIDGET(m_webView), targetList.get(), dragAction, 1, event);
+    GdkDragContext* context = gtk_drag_begin(GTK_WIDGET(m_webView), targetList.get(), dragOperationToGdkDragActions(clipboard->sourceOperation()), 1, event);
     webView->priv->draggingDataObjects.set(context, dataObject);