Title: [90927] trunk
- Revision
- 90927
- Author
- [email protected]
- Date
- 2011-07-13 10:04:28 -0700 (Wed, 13 Jul 2011)
Log Message
[GTK] media/media-blocked-by-willsendrequest.html fails
https://bugs.webkit.org/show_bug.cgi?id=63699
Reviewed by Martin Robinson.
* DumpRenderTree/gtk/DumpRenderTree.cpp:
(willSendRequestCallback): Abort the request if explicitely asked
by the LayoutTestController's willSendRequestReturnsNull() function.
LayoutTests:
[GTK] media/media-blocked-by-willsendrequest.html fails
https://bugs.webkit.org/show_bug.cgi?id=63699
Reviewed by Martin Robinson.
* platform/gtk/Skipped: Unskip fixed test.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (90926 => 90927)
--- trunk/LayoutTests/ChangeLog 2011-07-13 17:02:57 UTC (rev 90926)
+++ trunk/LayoutTests/ChangeLog 2011-07-13 17:04:28 UTC (rev 90927)
@@ -1,3 +1,12 @@
+2011-07-12 Philippe Normand <[email protected]>
+
+ [GTK] media/media-blocked-by-willsendrequest.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=63699
+
+ Reviewed by Martin Robinson.
+
+ * platform/gtk/Skipped: Unskip fixed test.
+
2011-07-13 Gabor Loki <[email protected]>
[Qt] Flakey test: xmlhttprequest-50ms-download-dispatch.html on ARM
Modified: trunk/LayoutTests/platform/gtk/Skipped (90926 => 90927)
--- trunk/LayoutTests/platform/gtk/Skipped 2011-07-13 17:02:57 UTC (rev 90926)
+++ trunk/LayoutTests/platform/gtk/Skipped 2011-07-13 17:04:28 UTC (rev 90927)
@@ -1546,9 +1546,6 @@
# https://bugs.webkit.org/show_bug.cgi?id=62585
fast/workers/worker-crash-with-invalid-location.html
-# https://bugs.webkit.org/show_bug.cgi?id=63699
-# access to file:// uris should be restricted in some cases.
-media/media-blocked-by-willsendrequest.html
# https://bugs.webkit.org/show_bug.cgi?id=64085
http/tests/misc/iframe-reparenting-id-collision.html
Modified: trunk/Tools/ChangeLog (90926 => 90927)
--- trunk/Tools/ChangeLog 2011-07-13 17:02:57 UTC (rev 90926)
+++ trunk/Tools/ChangeLog 2011-07-13 17:04:28 UTC (rev 90927)
@@ -1,3 +1,14 @@
+2011-07-12 Philippe Normand <[email protected]>
+
+ [GTK] media/media-blocked-by-willsendrequest.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=63699
+
+ Reviewed by Martin Robinson.
+
+ * DumpRenderTree/gtk/DumpRenderTree.cpp:
+ (willSendRequestCallback): Abort the request if explicitely asked
+ by the LayoutTestController's willSendRequestReturnsNull() function.
+
2011-07-13 Adam Barth <[email protected]>
Remove "Dismiss" button from garden-o-matic butterbar
Modified: trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp (90926 => 90927)
--- trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2011-07-13 17:02:57 UTC (rev 90926)
+++ trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2011-07-13 17:04:28 UTC (rev 90927)
@@ -1054,8 +1054,11 @@
static void willSendRequestCallback(WebKitWebView* webView, WebKitWebFrame*, WebKitWebResource*, WebKitNetworkRequest* request, WebKitNetworkResponse*)
{
- if (!done && gLayoutTestController->willSendRequestReturnsNull())
+ if (!done && gLayoutTestController->willSendRequestReturnsNull()) {
+ // As requested by the LayoutTestController, don't perform the request.
+ webkit_network_request_set_uri(request, "about:blank");
return;
+ }
SoupMessage* soupMessage = webkit_network_request_get_message(request);
SoupURI* uri = soup_uri_new(webkit_network_request_get_uri(request));
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
