Changeset 208657 in webkit

Timestamp:

Nov 12, 2016 2:24:33 PM (7 years ago)

Author:

BJ Burg

Message:

Web Automation: terminate the automation session if the web process crashes
​https://bugs.webkit.org/show_bug.cgi?id=164671
<rdar://problem/29028964>

Reviewed by Joseph Pecoraro.

• UIProcess/Automation/WebAutomationSession.h:
• UIProcess/Automation/WebAutomationSession.cpp:

(WebKit::WebAutomationSession::disconnect):
(WebKit::WebAutomationSession::terminate):
Factor out code that disconnects the remote, unpairs, and notifies the client.
Then, expose terminate() which can be called without a FrontendChannel.
Calling this causes the _WKAutomationDelegate to clear the local-side session in the
browser, and disconnecting from the remote will hang up the remote-side session.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::processDidCrash):
Terminate the session.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Automation/WebAutomationSession.cpp (modified) (1 diff)
• UIProcess/Automation/WebAutomationSession.h (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-11-12  Brian Burg  <bburg@apple.com>
+
+        Web Automation: terminate the automation session if the web process crashes
+        https://bugs.webkit.org/show_bug.cgi?id=164671
+        <rdar://problem/29028964>
+
+        Reviewed by Joseph Pecoraro.
+
+        * UIProcess/Automation/WebAutomationSession.h:
+        * UIProcess/Automation/WebAutomationSession.cpp:
+        (WebKit::WebAutomationSession::disconnect):
+        (WebKit::WebAutomationSession::terminate):
+        Factor out code that disconnects the remote, unpairs, and notifies the client.
+        Then, expose terminate() which can be called without a FrontendChannel.
+        Calling this causes the _WKAutomationDelegate to clear the local-side session in the
+        browser, and disconnecting from the remote will hang up the remote-side session.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::processDidCrash):
+        Terminate the session.
+
 2016-11-11  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp

@@ -130 +130 @@
 {
     ASSERT(channel == m_remoteChannel);
-
-    m_remoteChannel = nullptr;
-    m_frontendRouter->disconnectFrontend(channel);
+    terminate();
+}
+
+#endif // ENABLE(REMOTE_INSPECTOR)
+
+void WebAutomationSession::terminate()
+{
+#if ENABLE(REMOTE_INSPECTOR)
+    if (Inspector::FrontendChannel* channel = m_remoteChannel) {
+        m_remoteChannel = nullptr;
+        m_frontendRouter->disconnectFrontend(channel);
+    }
 
     setIsPaired(false);
+#endif
 
     if (m_client)
         m_client->didDisconnectFromRemote(this);
 }
-
-#endif // ENABLE(REMOTE_INSPECTOR)
 
 WebPageProxy* WebAutomationSession::webPageProxyForHandle(const String& handle)

trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.h

@@ -94 +94 @@
     void disconnect(Inspector::FrontendChannel*) override;
 #endif
+    void terminate();
 
     // Inspector::AutomationBackendDispatcherHandler API

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -5288 +5288 @@
     else
         m_loaderClient->processDidCrash(*this);
+
+    if (m_controlledByAutomation) {
+        if (auto* automationSession = process().processPool().automationSession())
+            automationSession->terminate();
+    }
 }