Title: [109756] releases/WebKitGTK/webkit-1.8
- Revision
- 109756
- Author
- mrobin...@webkit.org
- Date
- 2012-03-05 09:44:38 -0800 (Mon, 05 Mar 2012)
Log Message
Merging r109719
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-1.8/LayoutTests/ChangeLog (109755 => 109756)
--- releases/WebKitGTK/webkit-1.8/LayoutTests/ChangeLog 2012-03-05 17:15:48 UTC (rev 109755)
+++ releases/WebKitGTK/webkit-1.8/LayoutTests/ChangeLog 2012-03-05 17:44:38 UTC (rev 109756)
@@ -1,3 +1,21 @@
+2012-03-05 Martin Robinson <mrobin...@igalia.com>
+
+ [GTK] REGRESSION: r108278 broke some tests that expect focus
+ https://bugs.webkit.org/show_bug.cgi?id=79084
+
+ Reviewed by Philippe Normand.
+
+ * platform/gtk/Skipped: Unskip passing tests.
+
+2012-03-05 Martin Robinson <mrobin...@igalia.com>
+
+ [GTK] REGRESSION: r108278 broke some tests that expect focus
+ https://bugs.webkit.org/show_bug.cgi?id=79084
+
+ Reviewed by Philippe Normand.
+
+ * platform/gtk/Skipped: Unskip passing tests.
+
2012-02-22 Carlos Garcia Campos <cgar...@igalia.com>
Unreviewed, rolling out r107351.
Modified: releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/ChangeLog (109755 => 109756)
--- releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/ChangeLog 2012-03-05 17:15:48 UTC (rev 109755)
+++ releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/ChangeLog 2012-03-05 17:44:38 UTC (rev 109756)
@@ -1,3 +1,16 @@
+2012-03-05 Martin Robinson <mrobin...@igalia.com>
+
+ [GTK] REGRESSION: r108278 broke some tests that expect focus
+ https://bugs.webkit.org/show_bug.cgi?id=79084
+
+ Reviewed by Philippe Normand.
+
+ Grab focus before running the test. This ensures that if the
+ WebView lost focus, it has it before sending events.
+
+ * tests/testcopyandpaste.c:
+ (test_copy_and_paste): Grab focus.
+
2012-02-27 Vincent Untz <vu...@gnome.org>
Build fix for building with GTK+ 2.x.
Modified: releases/WebKitGTK/webkit-1.8/Tools/ChangeLog (109755 => 109756)
--- releases/WebKitGTK/webkit-1.8/Tools/ChangeLog 2012-03-05 17:15:48 UTC (rev 109755)
+++ releases/WebKitGTK/webkit-1.8/Tools/ChangeLog 2012-03-05 17:44:38 UTC (rev 109756)
@@ -1,3 +1,19 @@
+2012-03-05 Martin Robinson <mrobin...@igalia.com>
+
+ [GTK] REGRESSION: r108278 broke some tests that expect focus
+ https://bugs.webkit.org/show_bug.cgi?id=79084
+
+ Reviewed by Philippe Normand.
+
+ Grab focus when dumping test results and also when sending
+ events. During the course of testing, the WebView may lose
+ focus and this seems to snap it back when tests demand it.
+
+ * DumpRenderTree/gtk/DumpRenderTree.cpp:
+ (dump): Grab focus.
+ * DumpRenderTree/gtk/EventSender.cpp:
+ (dispatchEvent): Ditto.
+
2012-03-05 Kalev Lember <kalevlem...@gmail.com>
WebKitTestRunner: Explicitly include unistd.h for gcc 4.7
Modified: releases/WebKitGTK/webkit-1.8/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp (109755 => 109756)
--- releases/WebKitGTK/webkit-1.8/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2012-03-05 17:15:48 UTC (rev 109755)
+++ releases/WebKitGTK/webkit-1.8/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2012-03-05 17:44:38 UTC (rev 109756)
@@ -518,6 +518,10 @@
{
invalidateAnyPreviousWaitToDumpWatchdog();
+ // Grab widget focus before dumping the contents of a widget, in
+ // case it was lost in the course of the test.
+ gtk_widget_grab_focus(GTK_WIDGET(webView));
+
if (dumpTree) {
char* result = 0;
gchar* responseMimeType = webkit_web_frame_get_response_mime_type(mainFrame);
Modified: releases/WebKitGTK/webkit-1.8/Tools/DumpRenderTree/gtk/EventSender.cpp (109755 => 109756)
--- releases/WebKitGTK/webkit-1.8/Tools/DumpRenderTree/gtk/EventSender.cpp 2012-03-05 17:15:48 UTC (rev 109755)
+++ releases/WebKitGTK/webkit-1.8/Tools/DumpRenderTree/gtk/EventSender.cpp 2012-03-05 17:44:38 UTC (rev 109756)
@@ -561,6 +561,9 @@
return;
}
+ // The widget focus may have been lost in the course of the test,
+ // so force another explicit focus grab here.
+ gtk_widget_grab_focus(GTK_WIDGET(view));
gtk_main_do_event(event);
if (!currentDragSourceContext) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
