Changeset 60700 in webkit

Timestamp:

Jun 4, 2010 12:41:19 PM (14 years ago)

Author:

Martin Robinson

Message:

2010-06-04 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[GTK] EventSender should call gtk_main_do_event instead of invoking signal handlers directly
​https://bugs.webkit.org/show_bug.cgi?id=40182

Instead of invoking signal handlers directly via g_signal_emit_by_name, call
gtk_main_do_event. This will allow us to call gtk_get_current_event() in WebKit
without breaking DRT.

• DumpRenderTree/gtk/EventSender.cpp: (dispatchEvent): Use gtk_main_do_event instead of invoking signal handlers directly. (keyDownCallback): Use dispatchEvent here which now uses gtk_main_do_event.

Location:

trunk/WebKitTools

Files:

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

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-06-04  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] EventSender should call gtk_main_do_event instead of invoking signal handlers directly
+        https://bugs.webkit.org/show_bug.cgi?id=40182
+
+        Instead of invoking signal handlers directly via g_signal_emit_by_name, call
+        gtk_main_do_event. This will allow us to call gtk_get_current_event() in WebKit
+        without breaking DRT.
+
+        * DumpRenderTree/gtk/EventSender.cpp:
+        (dispatchEvent): Use gtk_main_do_event instead of invoking signal handlers directly.
+        (keyDownCallback): Use dispatchEvent here which now uses gtk_main_do_event.
+
 2010-06-04  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKitTools/DumpRenderTree/gtk/EventSender.cpp

@@ -367 +367 @@
         return;
 
-    gboolean returnValue;
-    if (event.type == GDK_BUTTON_PRESS || event.type == GDK_2BUTTON_PRESS || event.type == GDK_3BUTTON_PRESS)
-        g_signal_emit_by_name(view, "button_press_event", &event, &returnValue);
-    else if (event.type == GDK_BUTTON_RELEASE)
-        g_signal_emit_by_name(view, "button_release_event", &event, &returnValue);
-    else if (event.type == GDK_MOTION_NOTIFY)
-        g_signal_emit_by_name(view, "motion_notify_event", &event, &returnValue);
-    else if (event.type == GDK_SCROLL)
-        gtk_main_do_event(&event);
+    gtk_main_do_event(&event);
 }
 
@@ -535 +527 @@
     }
 
-    gboolean return_val;
     event.key.type = GDK_KEY_PRESS;
-
-    g_signal_emit_by_name(view, "key-press-event", &event.key, &return_val);
+    dispatchEvent(event);
 
     event.key.type = GDK_KEY_RELEASE;
-    g_signal_emit_by_name(view, "key-release-event", &event.key, &return_val);
+    dispatchEvent(event);
 
     return JSValueMakeUndefined(context);