[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

sergio at webkit.org sergio at webkit.org
Sun Feb 20 23:11:39 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit a4150dd6dc5f2d4288600969284e6dd720b03095
Author: sergio at webkit.org <sergio at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 18 21:28:55 2011 +0000

    2011-01-18  Sergio Villar Senin  <svillar at igalia.com>
    
            Reviewed by Martin Robinson.
    
            [Gtk] Build fixes for gtk3 build
            https://bugs.webkit.org/show_bug.cgi?id=52648
    
            * DumpRenderTree/gtk/EventSender.cpp:
            (beginDragWithFilesCallback):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76055 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 3a011c7..9bed6bb 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-18  Sergio Villar Senin  <svillar at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [Gtk] Build fixes for gtk3 build
+        https://bugs.webkit.org/show_bug.cgi?id=52648
+
+        * DumpRenderTree/gtk/EventSender.cpp:
+        (beginDragWithFilesCallback):
+
 2011-01-18  Dirk Pranke  <dpranke at chromium.org>
 
         Reviewed by Mihai Parparita.
diff --git a/Tools/DumpRenderTree/gtk/EventSender.cpp b/Tools/DumpRenderTree/gtk/EventSender.cpp
index 2f26b52..923a4ba 100644
--- a/Tools/DumpRenderTree/gtk/EventSender.cpp
+++ b/Tools/DumpRenderTree/gtk/EventSender.cpp
@@ -475,17 +475,18 @@ static JSValueRef beginDragWithFilesCallback(JSContextRef context, JSObjectRef f
         NULL);
 
     GdkEvent event;
+    GdkWindow* viewGDKWindow = gtk_widget_get_window(view);
     memset(&event, 0, sizeof(event));
     event.type = GDK_MOTION_NOTIFY;
     event.motion.x = lastMousePositionX;
     event.motion.y = lastMousePositionY;
     event.motion.time = GDK_CURRENT_TIME;
-    event.motion.window = view->window;
-    event.motion.device = gdk_device_get_core_pointer();
+    event.motion.window = viewGDKWindow;
+    event.motion.device = getDefaultGDKPointerDevice(viewGDKWindow);
     event.motion.state = GDK_BUTTON1_MASK;
 
     int xRoot, yRoot;
-    gdk_window_get_root_coords(view->window, lastMousePositionX, lastMousePositionY, &xRoot, &yRoot);
+    gdk_window_get_root_coords(viewGDKWindow, lastMousePositionX, lastMousePositionY, &xRoot, &yRoot);
     event.motion.x_root = xRoot;
     event.motion.y_root = yRoot;
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list