Changeset 244590 in webkit

Timestamp:

Apr 24, 2019 8:44:28 AM (5 years ago)

Author:

Chris Dumez

Message:

URL set by document.open() is communicated with the WebPageProxy but not the WebFrameProxy
​https://bugs.webkit.org/show_bug.cgi?id=197214
<rdar://problem/49237544>

Reviewed by Alex Christensen.

Source/WebKit:

URL set by document.open() is communicated with the WebPageProxy (since r244361) but not the
WebFrameProxy. This patch fixes this.

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _mainFrameURL]):

• UIProcess/API/Cocoa/WKWebViewPrivate.h:
• UIProcess/FrameLoadState.cpp:

(WebKit::FrameLoadState::didExplicitOpen):

• UIProcess/FrameLoadState.h:
• UIProcess/WebFrameProxy.cpp:

(WebKit::WebFrameProxy::didExplicitOpen):

• UIProcess/WebFrameProxy.h:
• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::didExplicitOpenForFrame):

Tools:

Extend API test coverage.

• TestWebKitAPI/Tests/WebKitCocoa/OpenAndCloseWindow.mm:

(TEST):

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)
• Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h (modified) (1 diff)
• Source/WebKit/UIProcess/FrameLoadState.cpp (modified) (1 diff)
• Source/WebKit/UIProcess/FrameLoadState.h (modified) (1 diff)
• Source/WebKit/UIProcess/WebFrameProxy.cpp (modified) (1 diff)
• Source/WebKit/UIProcess/WebFrameProxy.h (modified) (1 diff)
• Source/WebKit/UIProcess/WebPageProxy.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/OpenAndCloseWindow.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-04-24  Chris Dumez  <cdumez@apple.com>
+
+        URL set by document.open() is communicated with the WebPageProxy but not the WebFrameProxy
+        https://bugs.webkit.org/show_bug.cgi?id=197214
+        <rdar://problem/49237544>
+
+        Reviewed by Alex Christensen.
+
+        URL set by document.open() is communicated with the WebPageProxy (since r244361) but not the
+        WebFrameProxy. This patch fixes this.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _mainFrameURL]):
+        * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+        * UIProcess/FrameLoadState.cpp:
+        (WebKit::FrameLoadState::didExplicitOpen):
+        * UIProcess/FrameLoadState.h:
+        * UIProcess/WebFrameProxy.cpp:
+        (WebKit::WebFrameProxy::didExplicitOpen):
+        * UIProcess/WebFrameProxy.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::didExplicitOpenForFrame):
+
 2019-04-24  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm

@@ -4705 +4705 @@
 }
 
+- (NSURL *)_mainFrameURL
+{
+    if (auto* frame = _page->mainFrame())
+        return frame->url();
+    return nil;
+}
+
 - (void)_loadAlternateHTMLString:(NSString *)string baseURL:(NSURL *)baseURL forUnreachableURL:(NSURL *)unreachableURL
 {

trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h

@@ -137 +137 @@
 
 @property (nonatomic, readonly) NSURL *_unreachableURL;
+@property (nonatomic, readonly) NSURL *_mainFrameURL WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
 
 - (void)_loadAlternateHTMLString:(NSString *)string baseURL:(NSURL *)baseURL forUnreachableURL:(NSURL *)unreachableURL;

trunk/Source/WebKit/UIProcess/FrameLoadState.cpp

@@ -39 +39 @@
     m_state = State::Provisional;
     m_provisionalURL = url;
+}
+
+void FrameLoadState::didExplicitOpen(const URL& url)
+{
+    m_url = url;
+    m_provisionalURL = { };
 }
 

trunk/Source/WebKit/UIProcess/FrameLoadState.h

@@ -41 +41 @@
 
     void didStartProvisionalLoad(const URL&);
+    void didExplicitOpen(const URL&);
     void didReceiveServerRedirectForProvisionalLoad(const URL&);
     void didFailProvisionalLoad();

trunk/Source/WebKit/UIProcess/WebFrameProxy.cpp

@@ -147 +147 @@
 }
 
+void WebFrameProxy::didExplicitOpen(const URL& url)
+{
+    m_frameLoadState.didExplicitOpen(url);
+}
+
 void WebFrameProxy::didReceiveServerRedirectForProvisionalLoad(const URL& url)
 {

trunk/Source/WebKit/UIProcess/WebFrameProxy.h

@@ -112 +112 @@
 
     void didStartProvisionalLoad(const URL&);
+    void didExplicitOpen(const URL&);
     void didReceiveServerRedirectForProvisionalLoad(const URL&);
     void didFailProvisionalLoad();

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -3937 +3937 @@
         m_pageLoadState.didExplicitOpen(transaction, url);
 
+    frame->didExplicitOpen(url);
+
     m_hasCommittedAnyProvisionalLoads = true;
     m_process->didCommitProvisionalLoad();

trunk/Tools/ChangeLog

@@ +1 @@
+2019-04-24  Chris Dumez  <cdumez@apple.com>
+
+        URL set by document.open() is communicated with the WebPageProxy but not the WebFrameProxy
+        https://bugs.webkit.org/show_bug.cgi?id=197214
+        <rdar://problem/49237544>
+
+        Reviewed by Alex Christensen.
+
+        Extend API test coverage.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/OpenAndCloseWindow.mm:
+        (TEST):
+
 2019-04-24  Philippe Normand  <pnormand@igalia.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/OpenAndCloseWindow.mm

@@ -317 +317 @@
     while (![[[openedWebView URL] absoluteString] isEqualToString:[[webView URL] absoluteString]])
         TestWebKitAPI::Util::sleep(0.1);
-}
+
+    EXPECT_TRUE([[[openedWebView _mainFrameURL] absoluteString] isEqualToString:[[webView URL] absoluteString]]);
+}