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

[alex at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit e94126f54510c55fbdf4dc0257feafd2e3e6ad62
Author: alex at webkit.org <alex at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 30 20:16:37 2010 +0000

    2010-08-30  Alejandro G. Castro  <alex at igalia.com>
    
            Reviewed by Xan Lopez.
    
            Fixed compilation error, now that we have included the
            GtkVersioning.h we have to remove some version dependent code from
            EventSender.
    
            * platform/gtk/GtkVersioning.c:
            (gdk_window_get_root_coords):
            * platform/gtk/GtkVersioning.h:
    
    2010-08-30  Alejandro G. Castro  <alex at igalia.com>
    
            Reviewed by Xan Lopez.
    
            Fixed compilation error, now that we have included the
            GtkVersioning.h we have to remove some version dependent code from
            EventSender.
    
            * DumpRenderTree/gtk/EventSender.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66404 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8f55d70..bfc0bcb 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-30  Alejandro G. Castro  <alex at igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        Fixed compilation error, now that we have included the
+        GtkVersioning.h we have to remove some version dependent code from
+        EventSender.
+
+        * platform/gtk/GtkVersioning.c:
+        (gdk_window_get_root_coords):
+        * platform/gtk/GtkVersioning.h:
+
 2010-08-30  Beth Dakin  <bdakin at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebCore/platform/gtk/GtkVersioning.c b/WebCore/platform/gtk/GtkVersioning.c
index 0871d81..7dd601e 100644
--- a/WebCore/platform/gtk/GtkVersioning.c
+++ b/WebCore/platform/gtk/GtkVersioning.c
@@ -59,3 +59,11 @@ GdkDevice *getDefaultGDKPointerDevice(GdkWindow* window)
 #endif // GTK_API_VERSION_2
 }
 
+#if !GTK_CHECK_VERSION(2, 17, 3)
+static void gdk_window_get_root_coords(GdkWindow* window, gint x, gint y, gint* rootX, gint* rootY)
+{
+    gdk_window_get_root_origin(window, rootX, rootY);
+    *rootX = *rootX + x;
+    *rootY = *rootY + y;
+}
+#endif
diff --git a/WebCore/platform/gtk/GtkVersioning.h b/WebCore/platform/gtk/GtkVersioning.h
index 6ef8a0f..eac3cb5 100644
--- a/WebCore/platform/gtk/GtkVersioning.h
+++ b/WebCore/platform/gtk/GtkVersioning.h
@@ -54,6 +54,10 @@ G_BEGIN_DECLS
 #define gtk_widget_set_allocation(widget, alloc) ((widget)->allocation = *(alloc))
 #endif // GTK_CHECK_VERSION(2, 18, 0)
 
+#if !GTK_CHECK_VERSION(2, 17, 3)
+static void gdk_window_get_root_coords(GdkWindow* window, gint x, gint y, gint* rootX, gint* rootY);
+#endif //GTK_CHECK_VERSION(2, 17, 3)
+
 #if !GTK_CHECK_VERSION(2, 14, 0)
 #define gtk_widget_get_window(widget) (widget)->window
 #define gtk_adjustment_get_value(adj) (adj)->value
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 7d5bfda..9835845 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,15 @@
 2010-08-30  Alejandro G. Castro  <alex at igalia.com>
 
+        Reviewed by Xan Lopez.
+
+        Fixed compilation error, now that we have included the
+        GtkVersioning.h we have to remove some version dependent code from
+        EventSender.
+
+        * DumpRenderTree/gtk/EventSender.cpp:
+
+2010-08-30  Alejandro G. Castro  <alex at igalia.com>
+
         Reviewed by Martin Robinson.
 
         [Gtk] gdk_display_get_core_pointer and gdk_device_get_core_pointer
diff --git a/WebKitTools/DumpRenderTree/gtk/EventSender.cpp b/WebKitTools/DumpRenderTree/gtk/EventSender.cpp
index 49cd745..278a5c9 100644
--- a/WebKitTools/DumpRenderTree/gtk/EventSender.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/EventSender.cpp
@@ -88,37 +88,6 @@ static void sendOrQueueEvent(GdkEvent*, bool = true);
 static void dispatchEvent(GdkEvent* event);
 static guint getStateFlags();
 
-#if !GTK_CHECK_VERSION(2, 17, 3)
-static void gdk_window_get_root_coords(GdkWindow* window, gint x, gint y, gint* rootX, gint* rootY)
-{
-    gdk_window_get_root_origin(window, rootX, rootY);
-    *rootX = *rootX + x;
-    *rootY = *rootY + y;
-}
-#endif
-
-#if !GTK_CHECK_VERSION(2, 14, 0)
-static GdkWindow* gtk_widget_get_window(GtkWidget* widget)
-{
-    g_return_val_if_fail(GTK_IS_WIDGET(widget), 0);
-    return widget->window;
-}
-#endif
-
-#if !GTK_CHECK_VERSION(2, 21, 2)
-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);

-- 
WebKit Debian packaging