Changeset 60008 in webkit
- Timestamp:
- May 22, 2010 11:14:29 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r60001 r60008 1 2010-05-22 Martin Robinson <mrobinson@igalia.com> 2 3 Reviewed by Xan Lopez. 4 5 [GTK] WebKit/gtk/WebCoreSupport/DragClientGtk::startDrag should use the Clipboard::sourceOperation 6 https://bugs.webkit.org/show_bug.cgi?id=39459 7 8 Add ClipboardUtilitiesGtk, a container for GTK+/WebCore clipboard utility functions. 9 Initially add a function which converts a WebCore::DragOperation to a bitmask of 10 GdkDragActions. 11 12 No new tests, because behavior has not changed. 13 14 * GNUmakefile.am: 15 * platform/gtk/ClipboardUtilitiesGtk.cpp: Added. 16 (WebCore::dragOperationToGdkDragActions): Added. 17 * platform/gtk/ClipboardUtilitiesGtk.h: Added. 18 1 19 2010-05-21 Adam Barth <abarth@webkit.org> 2 20 -
trunk/WebCore/GNUmakefile.am
r59935 r60008 2110 2110 WebCore/platform/gtk/ClipboardGtk.cpp \ 2111 2111 WebCore/platform/gtk/ClipboardGtk.h \ 2112 WebCore/platform/gtk/ClipboardUtilitiesGtk.cpp \ 2113 WebCore/platform/gtk/ClipboardUtilitiesGtk.h \ 2112 2114 WebCore/platform/gtk/ContextMenuGtk.cpp \ 2113 2115 WebCore/platform/gtk/ContextMenuItemGtk.cpp \ -
trunk/WebKit/gtk/ChangeLog
r59935 r60008 1 2010-05-22 Martin Robinson <mrobinson@igalia.com> 2 3 Reviewed by Xan Lopez. 4 5 [GTK] WebKit/gtk/WebCoreSupport/DragClientGtk::startDrag should use the Clipboard::sourceOperation 6 https://bugs.webkit.org/show_bug.cgi?id=39459 7 8 * WebCoreSupport/DragClientGtk.cpp: 9 (WebKit::DragClient::startDrag): 10 Use Clipboard::sourceOperation instead of trying to figure out the GdkDragAction 11 manually. The DOM may have changed the appropriate list of actions anyhow. 12 1 13 2010-05-21 Steve Block <steveblock@google.com> 2 14 -
trunk/WebKit/gtk/WebCoreSupport/DragClientGtk.cpp
r59714 r60008 21 21 22 22 #include "ClipboardGtk.h" 23 #include "ClipboardUtilitiesGtk.h" 23 24 #include "DataObjectGtk.h" 24 25 #include "Document.h" 26 #include "DragController.h" 25 27 #include "Element.h" 26 28 #include "Frame.h" … … 72 74 ClipboardGtk* clipboardGtk = reinterpret_cast<ClipboardGtk*>(clipboard); 73 75 74 GdkDragAction dragAction = GDK_ACTION_COPY;75 if (linkDrag)76 dragAction = (GdkDragAction) (dragAction | GDK_ACTION_LINK);77 78 76 WebKitWebView* webView = webkit_web_frame_get_web_view(kit(frame)); 79 77 RefPtr<DataObjectGtk> dataObject = clipboardGtk->dataObject(); … … 85 83 event->button.time = GDK_CURRENT_TIME; 86 84 87 GdkDragContext* context = gtk_drag_begin(GTK_WIDGET(m_webView), targetList.get(), drag Action, 1, event);85 GdkDragContext* context = gtk_drag_begin(GTK_WIDGET(m_webView), targetList.get(), dragOperationToGdkDragActions(clipboard->sourceOperation()), 1, event); 88 86 webView->priv->draggingDataObjects.set(context, dataObject); 89 87
Note: See TracChangeset
for help on using the changeset viewer.