Title: [121109] trunk
Revision
121109
Author
[email protected]
Date
2012-06-23 22:32:08 -0700 (Sat, 23 Jun 2012)

Log Message

[Gtk] REGRESSION(r120918): Causes flaky DND tests
https://bugs.webkit.org/show_bug.cgi?id=89770

Reviewed by Martin Robinson.

Tools: 

Connect to the run-file-chooser signal of the WebKitWebView and
return TRUE so no file chooser dialog is run. This prevents certain
test failures.

* DumpRenderTree/gtk/DumpRenderTree.cpp:
(webViewRunFileChooser):
(createWebView):

LayoutTests: 

Remove test expectations for fast/events/domactivate-sets-underlying-click-event-as-handled.html
as the test now passes since the file chooser dialog is no longer run.

* platform/gtk/TestExpectations:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (121108 => 121109)


--- trunk/LayoutTests/ChangeLog	2012-06-24 05:29:31 UTC (rev 121108)
+++ trunk/LayoutTests/ChangeLog	2012-06-24 05:32:08 UTC (rev 121109)
@@ -1,3 +1,15 @@
+2012-06-23  Zan Dobersek  <[email protected]>
+
+        [Gtk] REGRESSION(r120918): Causes flaky DND tests
+        https://bugs.webkit.org/show_bug.cgi?id=89770
+
+        Reviewed by Martin Robinson.
+
+        Remove test expectations for fast/events/domactivate-sets-underlying-click-event-as-handled.html
+        as the test now passes since the file chooser dialog is no longer run.
+
+        * platform/gtk/TestExpectations:
+
 2012-06-23  Kenneth Russell  <[email protected]>
 
         [chromium] Layout Test fast/text/hyphen-min-preferred-width.html is failing

Modified: trunk/LayoutTests/platform/gtk/TestExpectations (121108 => 121109)


--- trunk/LayoutTests/platform/gtk/TestExpectations	2012-06-24 05:29:31 UTC (rev 121108)
+++ trunk/LayoutTests/platform/gtk/TestExpectations	2012-06-24 05:32:08 UTC (rev 121109)
@@ -456,8 +456,6 @@
 BUGWK84676 SKIP : fast/files/apply-blob-url-to-xhr.html = TIMEOUT
 BUGWK84676 SKIP : fast/files/file-reader-event-listener.html = TIMEOUT
 
-BUGWK87469 : fast/events/domactivate-sets-underlying-click-event-as-handled.html = TIMEOUT
-
 //////////////////////////////////////////////////////////////////////////////////////////
 // End of Tests timing out
 //////////////////////////////////////////////////////////////////////////////////////////

Modified: trunk/Tools/ChangeLog (121108 => 121109)


--- trunk/Tools/ChangeLog	2012-06-24 05:29:31 UTC (rev 121108)
+++ trunk/Tools/ChangeLog	2012-06-24 05:32:08 UTC (rev 121109)
@@ -1,3 +1,18 @@
+2012-06-23  Zan Dobersek  <[email protected]>
+
+        [Gtk] REGRESSION(r120918): Causes flaky DND tests
+        https://bugs.webkit.org/show_bug.cgi?id=89770
+
+        Reviewed by Martin Robinson.
+
+        Connect to the run-file-chooser signal of the WebKitWebView and
+        return TRUE so no file chooser dialog is run. This prevents certain
+        test failures.
+
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        (webViewRunFileChooser):
+        (createWebView):
+
 2012-06-23  Dan Bernstein  <[email protected]>
 
         debug-{minibrowser,safari,test-runner} fail when gdb is not installed in /usr/bin.

Modified: trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp (121108 => 121109)


--- trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp	2012-06-24 05:29:31 UTC (rev 121108)
+++ trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp	2012-06-24 05:32:08 UTC (rev 121109)
@@ -1273,6 +1273,13 @@
         printf("didRunInsecureContent\n");
 }
 
+static gboolean webViewRunFileChooser(WebKitWebView*, WebKitFileChooserRequest*)
+{
+    // We return TRUE to not propagate the event further so the
+    // default file chooser dialog is not shown.
+    return TRUE;
+}
+
 static WebKitWebView* createWebView()
 {
     // It is important to declare DRT is running early so when creating
@@ -1307,6 +1314,7 @@
                      "signal::resource-response-received", didReceiveResponse, 0,
                      "signal::resource-load-finished", didFinishLoading, 0,
                      "signal::resource-load-failed", didFailLoadingWithError, 0,
+                     "signal::run-file-chooser", webViewRunFileChooser, 0,
                      NULL);
     connectEditingCallbacks(view);
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to