Merge r232111 - [GTK] WebDriver: implement AutomationSessionClient::d…

…idDisconnectFromRemote https://bugs.webkit.org/show_bug.cgi?id=185866 Reviewed by Brian Burg. Source/WebDriver: Close the dbus connection when receiving an empty target list. * glib/SessionHostGlib.cpp: (WebDriver::SessionHost::setTargetList): Source/WebKit: To handle the case of the session being closed by the browser, for example in case of a network process crash. This is currently causing WebDriver tests to timeout in the bot. * UIProcess/API/glib/WebKitAutomationSession.cpp: Add an implementation of didDisconnectFromRemote() to notify the WebContext that the session will be closed. * UIProcess/API/glib/WebKitWebContext.cpp: Remove the automation session when closed. * UIProcess/API/glib/WebKitWebContextPrivate.h:
WebKit · Jun 11, 2018 · ee72f6b · ee72f6b
1 parent b7d6323
commit ee72f6b
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 0 deletions.
diff --git a/Source/WebDriver/ChangeLog b/Source/WebDriver/ChangeLog
@@ -1,3 +1,15 @@
+2018-05-23  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] WebDriver: implement AutomationSessionClient::didDisconnectFromRemote
+        https://bugs.webkit.org/show_bug.cgi?id=185866
+
+        Reviewed by Brian Burg.
+
+        Close the dbus connection when receiving an empty target list.
+
+        * glib/SessionHostGlib.cpp:
+        (WebDriver::SessionHost::setTargetList):
+
 2018-03-05  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         WebDriver: Also ignore NoSuchwindow errors when waiting for navigation to complete

diff --git a/Source/WebDriver/glib/SessionHostGlib.cpp b/Source/WebDriver/glib/SessionHostGlib.cpp
@@ -306,6 +306,8 @@ void SessionHost::setTargetList(uint64_t connectionID, Vector<Target>&& targetLi
     if (targetList.isEmpty()) {
         m_target = Target();
         m_connectionID = 0;
+        if (m_dbusConnection)
+            g_dbus_connection_close(m_dbusConnection.get(), nullptr, nullptr, nullptr);
         return;
     }
 

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2018-05-23  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] WebDriver: implement AutomationSessionClient::didDisconnectFromRemote
+        https://bugs.webkit.org/show_bug.cgi?id=185866
+
+        Reviewed by Brian Burg.
+
+        To handle the case of the session being closed by the browser, for example in case of a network process
+        crash. This is currently causing WebDriver tests to timeout in the bot.
+
+        * UIProcess/API/glib/WebKitAutomationSession.cpp: Add an implementation of didDisconnectFromRemote() to notify
+        the WebContext that the session will be closed.
+        * UIProcess/API/glib/WebKitWebContext.cpp: Remove the automation session when closed.
+        * UIProcess/API/glib/WebKitWebContextPrivate.h:
+
 2018-06-11  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Unreviewed. Remove PRIVATE keyword added in r232676.

diff --git a/Source/WebKit/UIProcess/API/glib/WebKitAutomationSession.cpp b/Source/WebKit/UIProcess/API/glib/WebKitAutomationSession.cpp
@@ -82,6 +82,11 @@ class AutomationSessionClient final : public API::AutomationSessionClient {
         return String::fromUTF8(m_session->priv->id.data());
     }
 
+    void didDisconnectFromRemote(WebAutomationSession&) override
+    {
+        webkitWebContextWillCloseAutomationSession(m_session->priv->webContext);
+    }
+
     WebPageProxy* didRequestNewWindow(WebAutomationSession&) override
     {
         WebKitWebView* webView = nullptr;

diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
@@ -242,6 +242,12 @@ class WebKitAutomationClient final : Inspector::RemoteInspector::Client {
 
     WebKitWebContext* m_webContext;
 };
+
+void webkitWebContextWillCloseAutomationSession(WebKitWebContext* webContext)
+{
+    webContext->priv->processPool->setAutomationSession(nullptr);
+    webContext->priv->automationSession = nullptr;
+}
 #endif // ENABLE(REMOTE_INSPECTOR)
 
 WEBKIT_DEFINE_TYPE(WebKitWebContext, webkit_web_context, G_TYPE_OBJECT)

diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebContextPrivate.h b/Source/WebKit/UIProcess/API/glib/WebKitWebContextPrivate.h
@@ -47,3 +47,6 @@ void webkitWebContextWebViewDestroyed(WebKitWebContext*, WebKitWebView*);
 WebKitWebView* webkitWebContextGetWebViewForPage(WebKitWebContext*, WebKit::WebPageProxy*);
 GVariant* webkitWebContextInitializeWebExtensions(WebKitWebContext*);
 void webkitWebContextInitializeNotificationPermissions(WebKitWebContext*);
+#if ENABLE(REMOTE_INSPECTOR)
+void webkitWebContextWillCloseAutomationSession(WebKitWebContext*);
+#endif