Attachment 339436 Details for Bug 185225 – Patch

[patch] Patch

bug-185225-20180503120803.patch (text/plain), 21.37 KB, created by Chris Dumez on 2018-05-03 12:08:03 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2018-05-03 12:08:03 PDT

Size: 21.37 KB

patch

obsolete

>Subversion Revision: 231230
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 999639dec7f482ad5643bc35f8d495dd16678abf..e22619080e97c80f92b044d4f5da6ef7b6918477 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,36 @@
>+2018-05-02  Chris Dumez  <cdumez@apple.com>
>+
>+        Load hangs if the WebProcess fails to launch
>+        https://bugs.webkit.org/show_bug.cgi?id=185225
>+        <rdar://problem/38249058>
>+
>+        Reviewed by Geoff Garen.
>+
>+        When a process fails to launch, ChildProcessProxy::didFinishLaunching() gets called with an
>+        invalid connection identifier. While NetworkProcessProxy::didFinishLaunching() properly deals with
>+        this situation, WebProcessProxy::didFinishLaunching() does not. As a result, we do not attempt to
>+        relaunch the process, we do not notify the client and WebPageProxy::m_isValid stays true.
>+
>+        This patch thus updates WebProcessProxy::didFinishLaunching() to check if the connection identifier
>+        is valid and treats it as a crash. As a result, the WebPageProxies properly reset their state and
>+        the client gets notified of the crash so that it can attempt to reload.
>+
>+        * UIProcess/API/Cocoa/WKProcessPool.mm:
>+        (-[WKProcessPool _makeNextWebProcessLaunchFailForTesting]):
>+        * UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
>+        * UIProcess/Launcher/ProcessLauncher.h:
>+        * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
>+        (WebKit::ProcessLauncher::launchProcess):
>+        Add SPI to make the next WebProcess launch fail, for the purpose of API testing.
>+
>+        * UIProcess/WebProcessPool.h:
>+        * UIProcess/WebProcessProxy.cpp:
>+        (WebKit::WebProcessProxy::getLaunchOptions):
>+        (WebKit::WebProcessProxy::didClose):
>+        (WebKit::WebProcessProxy::processDidTerminateOrFailedToLaunch):
>+        (WebKit::WebProcessProxy::didFinishLaunching):
>+        * UIProcess/WebProcessProxy.h:
>+
> 2018-05-01  Yusuke Suzuki  <utatane.tea@gmail.com>
> 
>         Use default std::optional if it is provided
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm b/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm
>index 21d78f594c22b911574ae091ebc28fa1bc324a76..a27a7b5eb4b2305f84529f8a1798215ab2655917 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm
>@@ -459,6 +459,11 @@ - (size_t)_webProcessCount
>     return _processPool->processes().size();
> }
> 
>+- (void)_makeNextWebProcessLaunchFailForTesting
>+{
>+    _processPool->setShouldMakeNextWebProcessLaunchFailForTesting(true);
>+}
>+
> - (size_t)_prewarmedWebProcessCount
> {
>     size_t result = 0;
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h b/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h
>index 58e876926b42139e7c13b73fd8c14d73124d44b7..46df02b3d5ea9aa221b47f6cb8753e8fc28f3a1d 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h
>@@ -94,6 +94,7 @@
> - (size_t)_pluginProcessCount WK_API_AVAILABLE(macosx(10.13.4), ios(11.3));
> - (size_t)_serviceWorkerProcessCount WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
> - (void)_syncNetworkProcessCookies WK_API_AVAILABLE(macosx(10.13), ios(11.0));
>+- (void)_makeNextWebProcessLaunchFailForTesting WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
> 
> // Test only. Returns web processes running web pages (does not include web processes running service workers)
> - (size_t)_webPageContentProcessCount WK_API_AVAILABLE(macosx(10.13.4), ios(11.3));
>diff --git a/Source/WebKit/UIProcess/Launcher/ProcessLauncher.h b/Source/WebKit/UIProcess/Launcher/ProcessLauncher.h
>index 13ab92becd735da7a268e42fa3c9e3f6e4152e4b..3ababbcceedce3e79dede0a33931a52f2ef57360 100644
>--- a/Source/WebKit/UIProcess/Launcher/ProcessLauncher.h
>+++ b/Source/WebKit/UIProcess/Launcher/ProcessLauncher.h
>@@ -65,6 +65,7 @@ public:
>         WebCore::ProcessIdentifier processIdentifier;
>         HashMap<String, String> extraInitializationData;
>         bool nonValidInjectedCodeAllowed { false };
>+        bool shouldMakeProcessLaunchFailForTesting { false };
> 
> #if ENABLE(DEVELOPER_MODE) && (PLATFORM(GTK) || PLATFORM(WPE))
>         String processCmdPrefix;
>diff --git a/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm b/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm
>index 0e07262a965d4ca7d21598c38efcec5a89bdc1f5..24c79ecdafad35855de88d118a549c5a74485798 100644
>--- a/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm
>+++ b/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm
>@@ -202,8 +202,8 @@ void ProcessLauncher::launchProcess()
>     xpc_dictionary_set_value(bootstrapMessage.get(), "extra-initialization-data", extraInitializationData.get());
> 
>     auto weakProcessLauncher = m_weakPtrFactory.createWeakPtr(*this);
>-    xpc_connection_set_event_handler(m_xpcConnection.get(), [weakProcessLauncher, listeningPort](xpc_object_t event) {
>-        ASSERT(xpc_get_type(event) == XPC_TYPE_ERROR);
>+    auto errorHandler = [weakProcessLauncher, listeningPort](xpc_object_t event) {
>+        ASSERT(!event || xpc_get_type(event) == XPC_TYPE_ERROR);
> 
>         auto processLauncher = weakProcessLauncher.get();
>         if (!processLauncher)
>@@ -229,10 +229,19 @@ void ProcessLauncher::launchProcess()
>         processLauncher->m_xpcConnection = nullptr;
> 
>         processLauncher->didFinishLaunchingProcess(0, IPC::Connection::Identifier());
>-    });
>+    };
>+
>+    xpc_connection_set_event_handler(m_xpcConnection.get(), errorHandler);
> 
>     xpc_connection_resume(m_xpcConnection.get());
> 
>+    if (UNLIKELY(m_launchOptions.shouldMakeProcessLaunchFailForTesting)) {
>+        RunLoop::main().dispatch([errorHandler = WTFMove(errorHandler)] {
>+            errorHandler(nullptr);
>+        });
>+        return;
>+    }
>+
>     ref();
>     xpc_connection_send_message_with_reply(m_xpcConnection.get(), bootstrapMessage.get(), dispatch_get_main_queue(), ^(xpc_object_t reply) {
>         // Errors are handled in the event handler.
>diff --git a/Source/WebKit/UIProcess/WebProcessPool.h b/Source/WebKit/UIProcess/WebProcessPool.h
>index 8c6a57cd1046a38020f36fa2b245fb216111eca9..70c45413686069ccc94330e60b6f2e86ea557d18 100644
>--- a/Source/WebKit/UIProcess/WebProcessPool.h
>+++ b/Source/WebKit/UIProcess/WebProcessPool.h
>@@ -276,6 +276,9 @@ public:
> 
>     void syncNetworkProcessCookies();
> 
>+    void setShouldMakeNextWebProcessLaunchFailForTesting(bool value) { m_shouldMakeNextWebProcessLaunchFailForTesting = value; }
>+    bool shouldMakeNextWebProcessLaunchFailForTesting() const { return m_shouldMakeNextWebProcessLaunchFailForTesting; }
>+
>     void reportWebContentCPUTime(Seconds cpuTime, uint64_t activityState);
> 
>     void allowSpecificHTTPSCertificateForHost(const WebCertificateInfo*, const String& host);
>@@ -631,6 +634,7 @@ private:
>     bool m_javaScriptConfigurationFileEnabled { false };
>     bool m_alwaysRunsAtBackgroundPriority;
>     bool m_shouldTakeUIBackgroundAssertion;
>+    bool m_shouldMakeNextWebProcessLaunchFailForTesting { false };
> 
>     UserObservablePageCounter m_userObservablePageCounter;
>     ProcessSuppressionDisabledCounter m_processSuppressionDisabledForPageCounter;
>diff --git a/Source/WebKit/UIProcess/WebProcessProxy.cpp b/Source/WebKit/UIProcess/WebProcessProxy.cpp
>index 4156d83383df6bef89d5bb4223506eda52b7a39e..e073e4d3e6256706485d85133b675c88cb6f87dc 100644
>--- a/Source/WebKit/UIProcess/WebProcessProxy.cpp
>+++ b/Source/WebKit/UIProcess/WebProcessProxy.cpp
>@@ -174,6 +174,11 @@ void WebProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOpt
>     }
> 
>     launchOptions.nonValidInjectedCodeAllowed = shouldAllowNonValidInjectedCode();
>+
>+    if (processPool().shouldMakeNextWebProcessLaunchFailForTesting()) {
>+        processPool().setShouldMakeNextWebProcessLaunchFailForTesting(false);
>+        launchOptions.shouldMakeProcessLaunchFailForTesting = true;
>+    }
> }
> 
> void WebProcessProxy::connectionWillOpen(IPC::Connection& connection)
>@@ -651,12 +656,18 @@ void WebProcessProxy::didReceiveSyncMessage(IPC::Connection& connection, IPC::De
> }
> 
> void WebProcessProxy::didClose(IPC::Connection&)
>+{
>+    processDidTerminateOrFailedToLaunch();
>+}
>+
>+void WebProcessProxy::processDidTerminateOrFailedToLaunch()
> {
>     // Protect ourselves, as the call to disconnect() below may otherwise cause us
>     // to be deleted before we can finish our work.
>     Ref<WebProcessProxy> protect(*this);
> 
>-    webConnection()->didClose();
>+    if (auto* webConnection = this->webConnection())
>+        webConnection->didClose();
> 
>     auto pages = copyToVectorOf<RefPtr<WebPageProxy>>(m_pageMap.values());
> 
>@@ -671,13 +682,13 @@ void WebProcessProxy::didClose(IPC::Connection&)
>     }
> #endif
> 
>-    for (auto& page : pages)
>-        page->processDidTerminate(ProcessTerminationReason::Crash);
>-
>     for (auto* suspendedPage : copyToVectorOf<SuspendedPageProxy*>(m_suspendedPageMap.values()))
>         suspendedPage->webProcessDidClose(*this);
> 
>     m_suspendedPageMap.clear();
>+
>+    for (auto& page : pages)
>+        page->processDidTerminate(ProcessTerminationReason::Crash);
> }
> 
> void WebProcessProxy::didReceiveInvalidMessage(IPC::Connection& connection, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
>@@ -737,6 +748,11 @@ void WebProcessProxy::didFinishLaunching(ProcessLauncher* launcher, IPC::Connect
> {
>     ChildProcessProxy::didFinishLaunching(launcher, connectionIdentifier);
> 
>+    if (!IPC::Connection::identifierIsValid(connectionIdentifier)) {
>+        processDidTerminateOrFailedToLaunch();
>+        return;
>+    }
>+
>     for (WebPageProxy* page : m_pageMap.values()) {
>         ASSERT(this == &page->process());
>         page->processDidFinishLaunching();
>diff --git a/Source/WebKit/UIProcess/WebProcessProxy.h b/Source/WebKit/UIProcess/WebProcessProxy.h
>index ef168421dc4e5b00b9a0e90bd21179a1d6509ab8..6f5c8ae94fd6122c822e3e9d44ac3e6578cc63c5 100644
>--- a/Source/WebKit/UIProcess/WebProcessProxy.h
>+++ b/Source/WebKit/UIProcess/WebProcessProxy.h
>@@ -270,6 +270,8 @@ private:
> 
>     void updateBackgroundResponsivenessTimer();
> 
>+    void processDidTerminateOrFailedToLaunch();
>+
>     // IPC::Connection::Client
>     friend class WebConnectionToWebProcess;
>     void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 7e547de7660bad661616f05189c0f4a737087311..201926a7eaac0095968628f8824af9949abf5cf9 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,20 @@
>+2018-05-02  Chris Dumez  <cdumez@apple.com>
>+
>+        Load hangs if the WebProcess fails to launch
>+        https://bugs.webkit.org/show_bug.cgi?id=185225
>+        <rdar://problem/38249058>
>+
>+        Reviewed by Geoff Garen.
>+
>+        Add API test coverage.
>+
>+        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
>+        * TestWebKitAPI/Tests/WebKitCocoa/WebContentProcessDidTerminate.mm: Added.
>+        (-[CrashOnStartNavigationDelegate _webView:webContentProcessDidTerminateWithReason:]):
>+        (-[CrashOnStartNavigationDelegate webView:didFinishNavigation:]):
>+        (-[CrashRecoveryScriptMessageHandler userContentController:didReceiveScriptMessage:]):
>+        (TEST):
>+
> 2018-05-02  Carlos Alberto Lopez Perez  <clopez@igalia.com>
> 
>         [GTK] Generate a JSC bundle on the 64 and 32 bit release bots and upload it to webkitgtk.org
>diff --git a/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj b/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
>index f1993fda3b9d49055cc5539a9aa6761029ed7330..2c67684571e4367b9677f95b2b3067fac712d59a 100644
>--- a/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
>+++ b/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
>@@ -545,6 +545,7 @@
> 		7CD4C26E1E2C0E6E00929470 /* StringConcatenate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CD4C26C1E2C0E6E00929470 /* StringConcatenate.cpp */; };
> 		7CEFA9661AC0B9E200B910FD /* _WKUserContentExtensionStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CEFA9641AC0B9E200B910FD /* _WKUserContentExtensionStore.mm */; };
> 		7CFBCAE51743238F00B2BFCF /* WillLoad_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CFBCAE31743238E00B2BFCF /* WillLoad_Bundle.cpp */; };
>+		830F2E0C209A6A8E00D36FF1 /* WebContentProcessDidTerminate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 830F2E0B209A6A7400D36FF1 /* WebContentProcessDidTerminate.mm */; };
> 		83148B06202AC6A400BADE99 /* InjectedBundleDisableOverrideBuiltinsBehavior.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83148B05202AC68200BADE99 /* InjectedBundleDisableOverrideBuiltinsBehavior.cpp */; };
> 		83148B07202AC6AD00BADE99 /* InjectedBundleDisableOverrideBuiltinsBehavior_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83148B04202AC68200BADE99 /* InjectedBundleDisableOverrideBuiltinsBehavior_Bundle.cpp */; };
> 		83148B09202AC78D00BADE99 /* override-builtins-test.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 83148B08202AC76800BADE99 /* override-builtins-test.html */; };
>@@ -1575,6 +1576,7 @@
> 		7CFBCADD1743234F00B2BFCF /* WillLoad.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WillLoad.cpp; sourceTree = "<group>"; };
> 		7CFBCAE31743238E00B2BFCF /* WillLoad_Bundle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WillLoad_Bundle.cpp; sourceTree = "<group>"; };
> 		81B50192140F232300D9EB58 /* StringBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StringBuilder.cpp; sourceTree = "<group>"; };
>+		830F2E0B209A6A7400D36FF1 /* WebContentProcessDidTerminate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebContentProcessDidTerminate.mm; sourceTree = "<group>"; };
> 		83148B04202AC68200BADE99 /* InjectedBundleDisableOverrideBuiltinsBehavior_Bundle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundleDisableOverrideBuiltinsBehavior_Bundle.cpp; sourceTree = "<group>"; };
> 		83148B05202AC68200BADE99 /* InjectedBundleDisableOverrideBuiltinsBehavior.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundleDisableOverrideBuiltinsBehavior.cpp; sourceTree = "<group>"; };
> 		83148B08202AC76800BADE99 /* override-builtins-test.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "override-builtins-test.html"; sourceTree = "<group>"; };
>@@ -2245,6 +2247,7 @@
> 				93E943F11CD3E87E00AC08C2 /* VideoControlsManager.mm */,
> 				6356FB211EC4E0BA0044BF18 /* VisibleContentRect.mm */,
> 				83779C371F82FEB0007CDA8A /* VisitedLinkStore.mm */,
>+				830F2E0B209A6A7400D36FF1 /* WebContentProcessDidTerminate.mm */,
> 				5C973F5B1F58EF0A00359C27 /* WebGLPolicy.mm */,
> 				51714EB61CF8C7A4004723C4 /* WebProcessKillIDBCleanup.mm */,
> 				C1D8EE212028E8E3008EB141 /* WebProcessTerminate.mm */,
>@@ -3769,6 +3772,7 @@
> 				83779C381F82FECE007CDA8A /* VisitedLinkStore.mm in Sources */,
> 				0F139E771A423A5B00F590F5 /* WeakObjCPtr.mm in Sources */,
> 				7CCE7F191A411AE600447C4C /* WebArchive.cpp in Sources */,
>+				830F2E0C209A6A8E00D36FF1 /* WebContentProcessDidTerminate.mm in Sources */,
> 				7C83E04C1D0A641800FEBCF3 /* WebCoreNSURLSession.mm in Sources */,
> 				7CCE7F1A1A411AE600447C4C /* WebCoreStatisticsWithNoWebProcess.cpp in Sources */,
> 				5C973F5C1F58EF8B00359C27 /* WebGLPolicy.mm in Sources */,
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebContentProcessDidTerminate.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebContentProcessDidTerminate.mm
>new file mode 100644
>index 0000000000000000000000000000000000000000..82e82cf4bd98750d1b0eda24a06c17ce7f04dd86
>--- /dev/null
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebContentProcessDidTerminate.mm
>@@ -0,0 +1,157 @@
>+/*
>+ * Copyright (C) 2018 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#include "config.h"
>+
>+#if WK_API_ENABLED
>+
>+#import "PlatformUtilities.h"
>+#import "Test.h"
>+#import <WebKit/WKNavigationDelegatePrivate.h>
>+#import <WebKit/WKNavigationPrivate.h>
>+#import <WebKit/WKProcessPoolPrivate.h>
>+#import <WebKit/WKWebView.h>
>+#import <wtf/RetainPtr.h>
>+
>+static bool didCrash;
>+static _WKProcessTerminationReason expectedCrashReason;
>+static bool finishedLoad;
>+static bool shouldLoadAgainOnCrash;
>+static bool receivedScriptMessage;
>+
>+static NSString *testHTML = @"<script>window.webkit.messageHandlers.testHandler.postMessage('LOADED');</script>";
>+
>+@interface CrashOnStartNavigationDelegate : NSObject <WKNavigationDelegate>
>+@end
>+
>+@implementation CrashOnStartNavigationDelegate
>+
>+- (void)_webView:(WKWebView *)webView webContentProcessDidTerminateWithReason:(_WKProcessTerminationReason)reason
>+{
>+    EXPECT_FALSE(didCrash);
>+    didCrash = true;
>+    EXPECT_EQ(expectedCrashReason, reason);
>+    EXPECT_EQ(0, webView._webProcessIdentifier);
>+
>+    // Attempt the load again.
>+    if (shouldLoadAgainOnCrash)
>+        [webView loadHTMLString:testHTML baseURL:nil];
>+}
>+
>+- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation
>+{
>+    finishedLoad = true;
>+}
>+
>+@end
>+
>+@interface CrashRecoveryScriptMessageHandler : NSObject <WKScriptMessageHandler>
>+@end
>+
>+@implementation CrashRecoveryScriptMessageHandler
>+
>+- (void)userContentController:(WKUserContentController *)userContentController didReceiveScriptMessage:(WKScriptMessage *)message
>+{
>+    EXPECT_STREQ([(NSString *)[message body] UTF8String], "LOADED");
>+    receivedScriptMessage = true;
>+}
>+
>+@end
>+
>+TEST(WKNavigation, FailureToStartWebProcessRecovery)
>+{
>+    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
>+    auto handler = adoptNS([[CrashRecoveryScriptMessageHandler alloc] init]);
>+    [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"testHandler"];
>+
>+    [configuration.get().processPool _makeNextWebProcessLaunchFailForTesting];
>+
>+    auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
>+
>+    auto delegate = adoptNS([[CrashOnStartNavigationDelegate alloc] init]);
>+    [webView setNavigationDelegate:delegate.get()];
>+
>+    finishedLoad = false;
>+    didCrash = false;
>+    receivedScriptMessage = false;
>+    expectedCrashReason = _WKProcessTerminationReasonCrash;
>+    shouldLoadAgainOnCrash = true;
>+
>+    [webView loadHTMLString:testHTML baseURL:nil];
>+    TestWebKitAPI::Util::run(&finishedLoad);
>+
>+    EXPECT_TRUE(didCrash);
>+    EXPECT_TRUE(!!webView.get()._webProcessIdentifier);
>+    EXPECT_TRUE(receivedScriptMessage);
>+}
>+
>+TEST(WKNavigation, FailureToStartWebProcessAfterCrashRecovery)
>+{
>+    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
>+    auto handler = adoptNS([[CrashRecoveryScriptMessageHandler alloc] init]);
>+    [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"testHandler"];
>+
>+    auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
>+
>+    auto delegate = adoptNS([[CrashOnStartNavigationDelegate alloc] init]);
>+    [webView setNavigationDelegate:delegate.get()];
>+
>+    receivedScriptMessage = false;
>+    finishedLoad = false;
>+    didCrash = false;
>+
>+    [webView loadHTMLString:testHTML baseURL:nil];
>+    TestWebKitAPI::Util::run(&finishedLoad);
>+
>+    EXPECT_FALSE(didCrash);
>+    EXPECT_TRUE(!!webView.get()._webProcessIdentifier);
>+    EXPECT_TRUE(receivedScriptMessage);
>+
>+    receivedScriptMessage = false;
>+    shouldLoadAgainOnCrash = false;
>+    expectedCrashReason = _WKProcessTerminationReasonRequestedByClient;
>+    [webView _killWebContentProcessAndResetState];
>+
>+    TestWebKitAPI::Util::run(&didCrash);
>+    EXPECT_TRUE(!webView.get()._webProcessIdentifier);
>+    EXPECT_FALSE(receivedScriptMessage);
>+
>+    expectedCrashReason = _WKProcessTerminationReasonCrash;
>+    didCrash = false;
>+    finishedLoad = false;
>+    receivedScriptMessage = false;
>+    shouldLoadAgainOnCrash = true;
>+
>+    [configuration.get().processPool _makeNextWebProcessLaunchFailForTesting];
>+    [webView loadHTMLString:testHTML baseURL:nil];
>+
>+    TestWebKitAPI::Util::run(&finishedLoad);
>+
>+    EXPECT_TRUE(didCrash);
>+    EXPECT_TRUE(!!webView.get()._webProcessIdentifier);
>+    EXPECT_TRUE(receivedScriptMessage);
>+}
>+
>+#endif // WK_API_ENABLED

Actions: View | Formatted Diff | Diff

Attachments on bug 185225: 339362 | 339436