Changeset 240599 in webkit

Timestamp:

Jan 28, 2019, 1:19:52 PM (6 years ago)

Author:

Chris Dumez

Message:

Regression(PSON) Crash under WebPageProxy::didStartProgress()
​https://bugs.webkit.org/show_bug.cgi?id=193915
<rdar://problem/47560907>

Reviewed by Alex Christensen.

Source/WebKit:

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::close):
Make sure we destroy the ProvisionalPageProxy if the page gets closed as we do not want to keep receiving
IPC after this or even worse, commit the provisional page.

(WebKit::WebPageProxy::didStartProgress):
Add an assertion in didStartProgress() to make sure we do not receive this IPC after the page has been
closed.

Tools:

Add API test coverage.

• TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/WebPageProxy.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-01-28  Chris Dumez  <cdumez@apple.com>
+
+        Regression(PSON) Crash under WebPageProxy::didStartProgress()
+        https://bugs.webkit.org/show_bug.cgi?id=193915
+        <rdar://problem/47560907>
+
+        Reviewed by Alex Christensen.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::close):
+        Make sure we destroy the ProvisionalPageProxy if the page gets closed as we do not want to keep receiving
+        IPC after this or even worse, commit the provisional page.
+
+        (WebKit::WebPageProxy::didStartProgress):
+        Add an assertion in didStartProgress() to make sure we do not receive this IPC after the page has been
+        closed.
+
 2019-01-28  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -966 +966 @@
 #endif
 
+    m_provisionalPage = nullptr;
+
     m_inspector->invalidate();
 
@@ -3712 +3714 @@
 void WebPageProxy::didStartProgress()
 {
+    ASSERT(!m_isClosed);
+
     PageClientProtector protector(pageClient());
 

trunk/Tools/ChangeLog

@@ +1 @@
+2019-01-28  Chris Dumez  <cdumez@apple.com>
+
+        Regression(PSON) Crash under WebPageProxy::didStartProgress()
+        https://bugs.webkit.org/show_bug.cgi?id=193915
+        <rdar://problem/47560907>
+
+        Reviewed by Alex Christensen.
+
+        Add API test coverage.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:
+
 2019-01-28  Aakash Jain  <aakash_jain@apple.com>
 

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

@@ -3352 +3352 @@
 }
 
+
+TEST(ProcessSwap, ClosePageAfterCrossSiteProvisionalLoad)
+{
+    auto processPoolConfiguration = adoptNS([[_WKProcessPoolConfiguration alloc] init]);
+    processPoolConfiguration.get().processSwapsOnNavigation = YES;
+    auto processPool = adoptNS([[WKProcessPool alloc] _initWithConfiguration:processPoolConfiguration.get()]);
+
+    auto webViewConfiguration = adoptNS([[WKWebViewConfiguration alloc] init]);
+    [webViewConfiguration setProcessPool:processPool.get()];
+    auto handler = adoptNS([[PSONScheme alloc] init]);
+    [webViewConfiguration setURLSchemeHandler:handler.get() forURLScheme:@"PSON"];
+
+    auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:webViewConfiguration.get()]);
+    auto navigationDelegate = adoptNS([[PSONNavigationDelegate alloc] init]);
+    [webView setNavigationDelegate:navigationDelegate.get()];
+
+    [webView configuration].preferences.safeBrowsingEnabled = NO;
+
+    [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"pson://www.webkit.org/main.html"]]];
+    TestWebKitAPI::Util::run(&done);
+    done = false;
+
+    didStartProvisionalLoad = false;
+    [webView loadRequest:[NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"simple" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]]];
+
+    navigationDelegate->decidePolicyForNavigationAction = ^(WKNavigationAction *, void (^decisionHandler)(WKNavigationActionPolicy)) {
+        decisionHandler(WKNavigationActionPolicyAllow);
+
+        [webView _close];
+        done = true;
+    };
+
+    TestWebKitAPI::Util::run(&done);
+    done = false;
+
+    TestWebKitAPI::Util::sleep(0.5);
+}
+
 #if PLATFORM(MAC)