Changeset 65922 in webkit

Timestamp:

Aug 24, 2010 12:26:40 PM (14 years ago)

Author:

Martin Robinson

Message:

2010-08-24 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[GTK] GTK3: EventSender and API tests should use gdk_event_new when synthesizing events
​https://bugs.webkit.org/show_bug.cgi?id=44534

Fix an issue where a GdkEvent* is treated like a GdkEvent.

• tests/testkeyevents.c: (key_press_event_cb): (key_release_event_cb):

2010-08-24 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[GTK] GTK3: EventSender and API tests should use gdk_event_new when synthesizing events
​https://bugs.webkit.org/show_bug.cgi?id=44534

Fix two double-frees introduced in my previous commit.

• DumpRenderTree/gtk/EventSender.cpp: (contextClickCallback): Copy the event before using it again. (keyDownCallback): Ditto.

Location:

trunk

Files:

• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/tests/testkeyevents.c (modified) (2 diffs)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/gtk/EventSender.cpp (modified) (3 diffs)

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2010-08-24  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] GTK3: EventSender and API tests should use gdk_event_new when synthesizing events
+        https://bugs.webkit.org/show_bug.cgi?id=44534
+
+        Fix an issue where a GdkEvent* is treated like a GdkEvent.
+
+        * tests/testkeyevents.c:
+        (key_press_event_cb):
+        (key_release_event_cb):
+
 2010-08-24  Martin Robinson  <mrobinson@igalia.com>
 

trunk/WebKit/gtk/tests/testkeyevents.c

@@ -83 +83 @@
 {
     KeyEventFixture* fixture = (KeyEventFixture*)data;
-    gboolean handled = GTK_WIDGET_GET_CLASS(fixture->webView)->key_press_event(GTK_WIDGET(fixture->webView), &event->key);
+    gboolean handled = GTK_WIDGET_GET_CLASS(fixture->webView)->key_press_event(GTK_WIDGET(fixture->webView), event->key);
     g_assert_cmpint(handled, ==, fixture->info->shouldBeHandled);
 
@@ -93 +93 @@
     // WebCore never seems to mark keyup events as handled.
     KeyEventFixture* fixture = (KeyEventFixture*)data;
-    gboolean handled = GTK_WIDGET_GET_CLASS(fixture->webView)->key_press_event(GTK_WIDGET(fixture->webView), &event->key);
+    gboolean handled = GTK_WIDGET_GET_CLASS(fixture->webView)->key_press_event(GTK_WIDGET(fixture->webView), event->key);
     g_assert(!handled);
 

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-08-24  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] GTK3: EventSender and API tests should use gdk_event_new when synthesizing events
+        https://bugs.webkit.org/show_bug.cgi?id=44534
+
+        Fix two double-frees introduced in my previous commit.
+
+        * DumpRenderTree/gtk/EventSender.cpp:
+        (contextClickCallback): Copy the event before using it again.
+        (keyDownCallback): Ditto.
+
 2010-08-24  Martin Robinson  <mrobinson@igalia.com>
 

trunk/WebKitTools/DumpRenderTree/gtk/EventSender.cpp

@@ -177 +177 @@
 static JSValueRef contextClickCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
-    GdkEvent* event = gdk_event_new(GDK_BUTTON_PRESS);
-    if (!prepareMouseButtonEvent(event, 2))
-        return JSValueMakeUndefined(context);
-
-    sendOrQueueEvent(event);
-    event->type = GDK_BUTTON_RELEASE;
-    sendOrQueueEvent(event);
+    GdkEvent* pressEvent = gdk_event_new(GDK_BUTTON_PRESS);
+    if (!prepareMouseButtonEvent(pressEvent, 2))
+        return JSValueMakeUndefined(context);
+
+    GdkEvent* releaseEvent = gdk_event_copy(pressEvent);
+    sendOrQueueEvent(pressEvent);
+    releaseEvent->type = GDK_BUTTON_RELEASE;
+    sendOrQueueEvent(releaseEvent);
 
     return JSValueMakeUndefined(context);
@@ -552 +553 @@
 
     // create and send the event
-    GdkEvent* event = gdk_event_new(GDK_KEY_PRESS);
-    event->key.keyval = gdkKeySym;
-    event->key.state = state;
-    event->key.window = gtk_widget_get_window(GTK_WIDGET(view));
-    g_object_ref(event->key.window);
+    GdkEvent* pressEvent = gdk_event_new(GDK_KEY_PRESS);
+    pressEvent->key.keyval = gdkKeySym;
+    pressEvent->key.state = state;
+    pressEvent->key.window = gtk_widget_get_window(GTK_WIDGET(view));
+    g_object_ref(pressEvent->key.window);
 
     // When synthesizing an event, an invalid hardware_keycode value
@@ -563 +564 @@
     gint n_keys;
     if (gdk_keymap_get_entries_for_keyval(gdk_keymap_get_default(), gdkKeySym, &keys, &n_keys)) {
-        event->key.hardware_keycode = keys[0].keycode;
+        pressEvent->key.hardware_keycode = keys[0].keycode;
         g_free(keys);
     }
 
-    dispatchEvent(event);
-
-    event->key.type = GDK_KEY_RELEASE;
-    dispatchEvent(event);
+    GdkEvent* releaseEvent = gdk_event_copy(pressEvent);
+    dispatchEvent(pressEvent);
+    releaseEvent->key.type = GDK_KEY_RELEASE;
+    dispatchEvent(releaseEvent);
 
     return JSValueMakeUndefined(context);