Changeset 163551 in webkit

Timestamp:

Feb 6, 2014 11:26:52 AM (10 years ago)

Author:

andersca@apple.com

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):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/NavigationState.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-02-06  Anders Carlsson  <andersca@apple.com>
+
+        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  <beidson@apple.com>
 

trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm

@@ -134 +134 @@
     [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;
 }
@@ -152 +155 @@
     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)];