Changeset 149371 in webkit

Timestamp:

Apr 30, 2013 8:58:41 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] --minimal build fails with error: class WebCore::EventHandler' has no member named 'dragSourceEndedAt
​https://bugs.webkit.org/show_bug.cgi?id=114299

Patch by Ed Bartosh <​bartosh@gmail.com> on 2013-04-30
Reviewed by Martin Robinson.

Wrapped code, related to drag&drop in #if ENABLE(DRAG_SUPPORT)

• webkit/webkitwebview.cpp:

(webkit_web_view_class_init):
(webkit_web_view_init):

Location:

trunk/Source/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• webkit/webkitwebview.cpp (modified) (6 diffs)

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2013-04-30  Ed Bartosh  <bartosh@gmail.com>
+
+        [GTK] --minimal build fails with error: class WebCore::EventHandler' has no member named 'dragSourceEndedAt
+        https://bugs.webkit.org/show_bug.cgi?id=114299
+
+        Reviewed by Martin Robinson.
+
+        Wrapped code, related to drag&drop in #if ENABLE(DRAG_SUPPORT)
+
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_class_init):
+        (webkit_web_view_init):
+
 2013-04-25  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp

@@ -1490 +1490 @@
 }
 
+#if ENABLE(DRAG_SUPPORT)
 static void webkit_web_view_drag_end(GtkWidget* widget, GdkDragContext* context)
 {
@@ -1585 +1586 @@
     return TRUE;
 }
+#endif // ENABLE(DRAG_SUPPORT)
 
 #if GTK_CHECK_VERSION(2, 12, 0)
@@ -3101 +3103 @@
     widgetClass->get_accessible = webkit_web_view_get_accessible;
     widgetClass->screen_changed = webkit_web_view_screen_changed;
+#if ENABLE(DRAG_SUPPORT)
     widgetClass->drag_end = webkit_web_view_drag_end;
     widgetClass->drag_data_get = webkit_web_view_drag_data_get;
@@ -3107 +3110 @@
     widgetClass->drag_drop = webkit_web_view_drag_drop;
     widgetClass->drag_data_received = webkit_web_view_drag_data_received;
+#else
+    widgetClass->drag_end = NULL;
+    widgetClass->drag_data_get = NULL;
+    widgetClass->drag_motion = NULL;
+    widgetClass->drag_leave = NULL;
+    widgetClass->drag_drop = NULL;
+    widgetClass->drag_data_received = NULL;
+#endif
 #if GTK_CHECK_VERSION(2, 12, 0)
     widgetClass->query_tooltip = webkit_web_view_query_tooltip;
@@ -3757 +3768 @@
 #endif
     pageClients.editorClient = new WebKit::EditorClient(webView);
+#if ENABLE(DRAG_SUPPORT)
     pageClients.dragClient = new WebKit::DragClient(webView);
+#endif
     pageClients.inspectorClient = new WebKit::InspectorClient(webView);
 
@@ -3825 +3838 @@
     priv->subResources = adoptGRef(g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_object_unref));
 
+#if ENABLE(DRAG_SUPPORT)
     priv->dragAndDropHelper.setWidget(GTK_WIDGET(webView));
     gtk_drag_dest_set(GTK_WIDGET(webView), static_cast<GtkDestDefaults>(0), 0, 0, static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK | GDK_ACTION_PRIVATE));
     gtk_drag_dest_set_target_list(GTK_WIDGET(webView), PasteboardHelper::defaultPasteboardHelper()->targetList());
+#endif
 
     priv->selfScrolling = false;