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

[xan at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 87bee73a4051b70804cee1596d548de26dd7056f
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 24 19:55:22 2010 +0000

    WebKit/gtk:
    
    2010-08-24  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Martin Robinson.
    
            Set a device to the event struct when building with GTK+ 3.x, it's
            mandatory.
    
            * tests/testcopyandpaste.c:
            (runPasteTestCallback):
    
    WebKitTools:
    
    2010-08-24  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Martin Robinson.
    
            Set a device to the event struct when building with GTK+ 3.x, it's
            mandatory.
    
            * DumpRenderTree/gtk/EventSender.cpp:
            (keyDownCallback):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65925 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 1c8213a..3a4692d 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-24  Xan Lopez  <xlopez at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        Set a device to the event struct when building with GTK+ 3.x, it's
+        mandatory.
+
+        * tests/testcopyandpaste.c:
+        (runPasteTestCallback):
+
 2010-08-24  Martin Robinson  <mrobinson at igalia.com>
 
         Build fix for GTK+.
diff --git a/WebKit/gtk/tests/testcopyandpaste.c b/WebKit/gtk/tests/testcopyandpaste.c
index f3b1783..58fb764 100644
--- a/WebKit/gtk/tests/testcopyandpaste.c
+++ b/WebKit/gtk/tests/testcopyandpaste.c
@@ -133,6 +133,9 @@ static JSValueRef runPasteTestCallback(JSContextRef context, JSObjectRef functio
     event->key.state = GDK_CONTROL_MASK;
     event->key.window = gtk_widget_get_window(GTK_WIDGET(currentFixture->webView));
     g_object_ref(event->key.window);
+#ifndef GTK_API_VERSION_2
+    gdk_event_set_device(event, gdk_device_get_associated_device(gdk_display_get_core_pointer(gdk_drawable_get_display(event->key.window))));
+#endif
     GdkKeymapKey* keys;
     gint n_keys;
     if (gdk_keymap_get_entries_for_keyval(gdk_keymap_get_default(), event->key.keyval, &keys, &n_keys)) {
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index af8b3c8..30a4e84 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-24  Xan Lopez  <xlopez at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        Set a device to the event struct when building with GTK+ 3.x, it's
+        mandatory.
+
+        * DumpRenderTree/gtk/EventSender.cpp:
+        (keyDownCallback):
+
 2010-08-24  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Xan Lopez.
diff --git a/WebKitTools/DumpRenderTree/gtk/EventSender.cpp b/WebKitTools/DumpRenderTree/gtk/EventSender.cpp
index 81ccede..fa3af64 100644
--- a/WebKitTools/DumpRenderTree/gtk/EventSender.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/EventSender.cpp
@@ -557,7 +557,9 @@ static JSValueRef keyDownCallback(JSContextRef context, JSObjectRef function, JS
     pressEvent->key.state = state;
     pressEvent->key.window = gtk_widget_get_window(GTK_WIDGET(view));
     g_object_ref(pressEvent->key.window);
-
+#ifndef GTK_API_VERSION_2
+    gdk_event_set_device(pressEvent, gdk_device_get_associated_device(gdk_display_get_core_pointer(gdk_drawable_get_display(pressEvent->key.window))));
+#endif
     // When synthesizing an event, an invalid hardware_keycode value
     // can cause it to be badly processed by Gtk+.
     GdkKeymapKey* keys;

-- 
WebKit Debian packaging