Title: [108312] trunk/Source/WebKit/gtk
Revision
108312
Author
[email protected]
Date
2012-02-20 23:44:36 -0800 (Mon, 20 Feb 2012)

Log Message

Fix GTK+ unit tests after r108278.

Reviewed by Alejandro G. Castro.

Now that WebCore is no longer stealing focus, we need to
adjust where we grab focus to ensure that it actually succeeds.

* tests/testcopyandpaste.c:
(map_event_cb): No longer grab focus here.
(runPasteTestCallback): Grabbing focus here seems to be late enough in the process.

Modified Paths

Diff

Modified: trunk/Source/WebKit/gtk/ChangeLog (108311 => 108312)


--- trunk/Source/WebKit/gtk/ChangeLog	2012-02-21 07:32:52 UTC (rev 108311)
+++ trunk/Source/WebKit/gtk/ChangeLog	2012-02-21 07:44:36 UTC (rev 108312)
@@ -1,5 +1,18 @@
 2012-02-20  Martin Robinson  <[email protected]>
 
+        Fix GTK+ unit tests after r108278.
+
+        Reviewed by Alejandro G. Castro.
+
+        Now that WebCore is no longer stealing focus, we need to
+        adjust where we grab focus to ensure that it actually succeeds.
+
+        * tests/testcopyandpaste.c:
+        (map_event_cb): No longer grab focus here.
+        (runPasteTestCallback): Grabbing focus here seems to be late enough in the process.
+
+2012-02-20  Martin Robinson  <[email protected]>
+
         [GTK] Web content oftens steals focus from other widgets
         https://bugs.webkit.org/show_bug.cgi?id=77791
 

Modified: trunk/Source/WebKit/gtk/tests/testcopyandpaste.c (108311 => 108312)


--- trunk/Source/WebKit/gtk/tests/testcopyandpaste.c	2012-02-21 07:32:52 UTC (rev 108311)
+++ trunk/Source/WebKit/gtk/tests/testcopyandpaste.c	2012-02-21 07:44:36 UTC (rev 108312)
@@ -111,7 +111,6 @@
 
 gboolean map_event_cb(GtkWidget *widget, GdkEvent* event, gpointer data)
 {
-    gtk_widget_grab_focus(widget);
     CopyAndPasteFixture* fixture = (CopyAndPasteFixture*)data;
     webkit_web_view_load_string(fixture->webView, fixture->info->page,
                                 "text/html", "utf-8", "file://");
@@ -137,6 +136,8 @@
 static CopyAndPasteFixture* currentFixture;
 static JSValueRef runPasteTestCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
+    gtk_widget_grab_focus(GTK_WIDGET(currentFixture->webView));
+
     // Simulate a paste keyboard sequence.
     GdkEvent* event = gdk_event_new(GDK_KEY_PRESS);
     event->key.keyval = gdk_unicode_to_keyval('v');
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to