[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[mrobinson at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 348e8b5377d6c6f993065a28a77009c2d941efe6
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 29 17:32:35 2010 +0000

    2010-07-29  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Xan Lopez.
    
            Build fix for building against GTK+ 3.x. GSEAL requires that we
            access internals of the GdkDragContext via methods. For older versions
            of GTK+, define those methods.
    
            * DumpRenderTree/gtk/EventSender.cpp:
            (gdk_drag_context_get_selected_action): Added.
            (gdk_drag_context_get_actions): Added.
            (dispatchEvent): Use the two new accessor methods.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64290 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index dd00e52..7d19f69 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-29  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        Build fix for building against GTK+ 3.x. GSEAL requires that we
+        access internals of the GdkDragContext via methods. For older versions
+        of GTK+, define those methods.
+
+        * DumpRenderTree/gtk/EventSender.cpp:
+        (gdk_drag_context_get_selected_action): Added.
+        (gdk_drag_context_get_actions): Added.
+        (dispatchEvent): Use the two new accessor methods.
+
 2010-07-29  Adam Roben  <aroben at apple.com>
 
         Always say "plugins directory" when referring to a directory
diff --git a/WebKitTools/DumpRenderTree/gtk/EventSender.cpp b/WebKitTools/DumpRenderTree/gtk/EventSender.cpp
index b95fec2..330db46 100644
--- a/WebKitTools/DumpRenderTree/gtk/EventSender.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/EventSender.cpp
@@ -103,6 +103,20 @@ static GdkWindow* gtk_widget_get_window(GtkWidget* widget)
 }
 #endif
 
+#if !GTK_CHECK_VERSION(2, 22, 0)
+static GdkDragAction gdk_drag_context_get_selected_action(GdkDragContext* context)
+{
+    g_return_val_if_fail(GDK_IS_DRAG_CONTEXT(context), static_cast<GdkDragAction>(0));
+    return context->action;
+}
+
+static GdkDragAction gdk_drag_context_get_actions(GdkDragContext* context)
+{
+    g_return_val_if_fail(GDK_IS_DRAG_CONTEXT(context), GDK_ACTION_DEFAULT);
+    return context->actions;
+}
+#endif
+
 static JSValueRef getDragModeCallback(JSContextRef context, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception)
 {
     return JSValueMakeBoolean(context, dragMode);
@@ -371,10 +385,12 @@ static void dispatchEvent(GdkEvent event)
 
         // Simulate a drag motion on the top-level GDK window.
         GtkWidget* parentWidget = gtk_widget_get_parent(GTK_WIDGET(view));
-        GdkWindow* parentWidgetWindow = parentWidget->window;
+        GdkWindow* parentWidgetWindow = gtk_widget_get_window(parentWidget);
         gdk_drag_motion(currentDragSourceContext, parentWidgetWindow, GDK_DRAG_PROTO_XDND,
             event.motion.x_root, event.motion.y_root,
-            currentDragSourceContext->action, currentDragSourceContext->actions, GDK_CURRENT_TIME);
+            gdk_drag_context_get_selected_action(currentDragSourceContext),
+            gdk_drag_context_get_actions(currentDragSourceContext),
+            GDK_CURRENT_TIME);
 
     } else if (currentDragSourceContext && event.type == GDK_BUTTON_RELEASE) {
         // We've released the mouse button, we should just be able to spin the

-- 
WebKit Debian packaging