Title: [90238] trunk
- Revision
- 90238
- Author
- [email protected]
- Date
- 2011-07-01 09:51:24 -0700 (Fri, 01 Jul 2011)
Log Message
WebKit2: DidFinishLoadForFrame is never called on iframes when loads are
cancelled by willSendRequest
https://bugs.webkit.org/show_bug.cgi?id=63753
Reviewed by Darin Adler.
Source/WebKit2:
When deciding a policy for a null request, call the callback that was passed
to WebKit2 and say that we used the loader.
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForResponse):
LayoutTests:
Unskip WebKit2 tests that now pass.
* platform/wk2/Skipped:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (90237 => 90238)
--- trunk/LayoutTests/ChangeLog 2011-07-01 16:33:46 UTC (rev 90237)
+++ trunk/LayoutTests/ChangeLog 2011-07-01 16:51:24 UTC (rev 90238)
@@ -1,3 +1,15 @@
+2011-06-30 Brian Weinstein <[email protected]>
+
+ Reviewed by Darin Adler.
+
+ WebKit2: DidFinishLoadForFrame is never called on iframes when loads are
+ cancelled by willSendRequest
+ https://bugs.webkit.org/show_bug.cgi?id=63753
+
+ Unskip WebKit2 tests that now pass.
+
+ * platform/wk2/Skipped:
+
2011-07-01 Adam Roben <[email protected]>
Skip one asserting and one timing-out test on Windows
Modified: trunk/LayoutTests/platform/wk2/Skipped (90237 => 90238)
--- trunk/LayoutTests/platform/wk2/Skipped 2011-07-01 16:33:46 UTC (rev 90237)
+++ trunk/LayoutTests/platform/wk2/Skipped 2011-07-01 16:51:24 UTC (rev 90238)
@@ -2048,10 +2048,6 @@
# Mysterious failure after enabling paste tests
platform/mac/editing/pasteboard/text-precomposed.html
-# Unexplained failures after implementing willSendRequestReturnsNull
-fast/loader/onload-willSendRequest-null-for-frame.html
-plugins/plugin-document-willSendRequest-null.html
-
# An empty layer is missing.
platform/mac/fast/forms/input-appearance-spinbutton-up.html
Modified: trunk/Source/WebKit2/ChangeLog (90237 => 90238)
--- trunk/Source/WebKit2/ChangeLog 2011-07-01 16:33:46 UTC (rev 90237)
+++ trunk/Source/WebKit2/ChangeLog 2011-07-01 16:51:24 UTC (rev 90238)
@@ -1,3 +1,17 @@
+2011-06-30 Brian Weinstein <[email protected]>
+
+ Reviewed by Darin Adler.
+
+ WebKit2: DidFinishLoadForFrame is never called on iframes when loads are
+ cancelled by willSendRequest
+ https://bugs.webkit.org/show_bug.cgi?id=63753
+
+ When deciding a policy for a null request, call the callback that was passed
+ to WebKit2 and say that we used the loader.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForResponse):
+
2011-07-01 Balazs Kelemen <[email protected]>
Reviewed by Andreas Kling.
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (90237 => 90238)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2011-07-01 16:33:46 UTC (rev 90237)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2011-07-01 16:51:24 UTC (rev 90238)
@@ -601,8 +601,10 @@
if (!webPage)
return;
- if (!request.url().string())
+ if (!request.url().string()) {
+ (m_frame->coreFrame()->loader()->policyChecker()->*function)(PolicyUse);
return;
+ }
RefPtr<APIObject> userData;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
