From fa6cd74dc14bdbf1235573319b8bc674ec9ad2be Mon Sep 17 00:00:00 2001 From: "philn@webkit.org" Date: Tue, 21 Feb 2012 11:46:07 +0000 Subject: [PATCH] Fix one more GTK+ unit test after r108278. Reviewed by Alejandro G. Castro. * tests/testkeyevents.c: (map_event_cb): No longer grab focus here. (setup_keyevent_test): Grabbing focus here seems to be late enough in the process. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108334 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit/gtk/ChangeLog | 10 ++++++++++ Source/WebKit/gtk/tests/testkeyevents.c | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Source/WebKit/gtk/ChangeLog b/Source/WebKit/gtk/ChangeLog index 62a872e..48d7a72 100644 --- a/Source/WebKit/gtk/ChangeLog +++ b/Source/WebKit/gtk/ChangeLog @@ -1,3 +1,13 @@ +2012-02-21 Philippe Normand + + Fix one more GTK+ unit test after r108278. + + Reviewed by Alejandro G. Castro. + + * tests/testkeyevents.c: + (map_event_cb): No longer grab focus here. + (setup_keyevent_test): Grabbing focus here seems to be late enough in the process. + 2012-02-20 Martin Robinson Fix GTK+ unit tests after r108281. diff --git a/Source/WebKit/gtk/tests/testkeyevents.c b/Source/WebKit/gtk/tests/testkeyevents.c index cf33d4a..b55b4bc 100644 --- a/Source/WebKit/gtk/tests/testkeyevents.c +++ b/Source/WebKit/gtk/tests/testkeyevents.c @@ -118,7 +118,6 @@ static void test_keypress_events_load_status_cb(WebKitWebView* webView, GParamSp gboolean map_event_cb(GtkWidget *widget, GdkEvent* event, gpointer data) { - gtk_widget_grab_focus(widget); KeyEventFixture* fixture = (KeyEventFixture*)data; webkit_web_view_load_string(fixture->webView, fixture->info->page, "text/html", "utf-8", "file://"); @@ -131,6 +130,7 @@ static void setup_keyevent_test(KeyEventFixture* fixture, gconstpointer data, GC g_signal_connect(fixture->window, "map-event", G_CALLBACK(map_event_cb), fixture); + gtk_widget_grab_focus(GTK_WIDGET(fixture->webView)); gtk_widget_show(fixture->window); gtk_widget_show(GTK_WIDGET(fixture->webView)); gtk_window_present(GTK_WINDOW(fixture->window)); -- 2.7.4