Changeset 49921 in webkit

Timestamp:

Oct 21, 2009 1:47:21 PM (15 years ago)

Author:

eric@webkit.org

Message:

2009-10-21 Alejandro G. Castro <​alex@igalia.com>

Reviewed by Gustavo Noronha.

[GTK] Added conditional code to avoid using
gdk_window_get_root_coords if we do not have a gtk+ release newer
than 2.17.3.
​https://bugs.webkit.org/show_bug.cgi?id=30636

• WebKitTools/DumpRenderTree/gtk/EventSender.cpp:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/gtk/EventSender.cpp (modified) (4 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-10-21  Alejandro G. Castro  <alex@igalia.com>
+
+        Reviewed by Gustavo Noronha.
+
+        [GTK] Added conditional code to avoid using
+        gdk_window_get_root_coords if we do not have a gtk+ release newer
+        than 2.17.3.
+        https://bugs.webkit.org/show_bug.cgi?id=30636
+
+        * WebKitTools/DumpRenderTree/gtk/EventSender.cpp:
+
 2009-10-21  Shu Chang  <Chang.Shu@nokia.com>
 

trunk/WebKitTools/DumpRenderTree/gtk/EventSender.cpp

@@ -130 +130 @@
 }
 
+#if !GTK_CHECK_VERSION(2,17,3)
+static void getRootCoords(GtkWidget* view, int* rootX, int* rootY)
+{
+    GtkWidget* window = gtk_widget_get_toplevel(GTK_WIDGET(view));
+    int tmpX, tmpY;
+
+    gtk_widget_translate_coordinates(view, window, lastMousePositionX, lastMousePositionY, &tmpX, &tmpY);
+
+    gdk_window_get_origin(window->window, rootX, rootY);
+
+    *rootX += tmpX;
+    *rootY += tmpY;
+}
+#endif
+
 static JSValueRef mouseDownCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
@@ -157 +172 @@
 
     int x_root, y_root;
+#if GTK_CHECK_VERSION(2,17,3)
     gdk_window_get_root_coords(GTK_WIDGET(view)->window, lastMousePositionX, lastMousePositionY, &x_root, &y_root);
+#else
+    getRootCoords(GTK_WIDGET(view), &x_root, &y_root);
+#endif
 
     event.button.x_root = x_root;
@@ -210 +229 @@
 
     int x_root, y_root;
+#if GTK_CHECK_VERSION(2,17,3)
     gdk_window_get_root_coords(GTK_WIDGET(view)->window, lastMousePositionX, lastMousePositionY, &x_root, &y_root);
+#else
+    getRootCoords(GTK_WIDGET(view), &x_root, &y_root);
+#endif
 
     event.button.x_root = x_root;
@@ -256 +279 @@
 
     int x_root, y_root;
+#if GTK_CHECK_VERSION(2,17,3)
     gdk_window_get_root_coords(GTK_WIDGET(view)->window, lastMousePositionX, lastMousePositionY, &x_root, &y_root);
+#else
+    getRootCoords(GTK_WIDGET(view), &x_root, &y_root);
+#endif
 
     event.motion.x_root = x_root;