Title: [163551] trunk/Source/WebKit2
- Revision
- 163551
- Author
- [email protected]
- Date
- 2014-02-06 11:26:52 -0800 (Thu, 06 Feb 2014)
Log Message
The source frame request is not the same thing as the original request
https://bugs.webkit.org/show_bug.cgi?id=128317
Reviewed by Andreas Kling.
Grab the source frame URL From the WebFrameProxy object.
* UIProcess/Cocoa/NavigationState.mm:
(WebKit::frameInfoFromWebFrameProxy):
(WebKit::NavigationState::PolicyClient::decidePolicyForNavigationAction):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (163550 => 163551)
--- trunk/Source/WebKit2/ChangeLog 2014-02-06 18:54:31 UTC (rev 163550)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-06 19:26:52 UTC (rev 163551)
@@ -1,3 +1,16 @@
+2014-02-06 Anders Carlsson <[email protected]>
+
+ The source frame request is not the same thing as the original request
+ https://bugs.webkit.org/show_bug.cgi?id=128317
+
+ Reviewed by Andreas Kling.
+
+ Grab the source frame URL From the WebFrameProxy object.
+
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::frameInfoFromWebFrameProxy):
+ (WebKit::NavigationState::PolicyClient::decidePolicyForNavigationAction):
+
2014-02-06 Brady Eidson <[email protected]>
IDB: storage/indexeddb/mozilla/clear.html fails
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (163550 => 163551)
--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-02-06 18:54:31 UTC (rev 163550)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-02-06 19:26:52 UTC (rev 163551)
@@ -133,6 +133,9 @@
[frameInfo setMainFrame:webFrameProxy.isMainFrame()];
+ // FIXME: This should use the full request of the frame, not just the URL.
+ [frameInfo setRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:webFrameProxy.url()]]];
+
return frameInfo;
}
@@ -151,11 +154,8 @@
// FIXME: Set up the navigation action object.
auto navigationAction = adoptNS([[WKNavigationAction alloc] init]);
- if (sourceFrame) {
- auto sourceFrameInfo = frameInfoFromWebFrameProxy(*sourceFrame);
- [sourceFrameInfo setRequest:originalRequest.nsURLRequest(WebCore::DoNotUpdateHTTPBody)];
- [navigationAction setSourceFrame:sourceFrameInfo.get()];
- }
+ if (sourceFrame)
+ [navigationAction setSourceFrame:frameInfoFromWebFrameProxy(*sourceFrame).get()];
[navigationAction setNavigationType:toWKNavigationType(navigationActionData.navigationType)];
[navigationAction setRequest:request.nsURLRequest(WebCore::DoNotUpdateHTTPBody)];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
