Attachment 358253 Details for Bug 193104 – Patch

[patch] Patch

wd-closed.diff (text/plain), 1.84 KB, created by Carlos Garcia Campos on 2019-01-03 07:33:09 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2019-01-03 07:33:09 PST

Size: 1.84 KB

patch

obsolete

>diff --git a/Source/WebDriver/ChangeLog b/Source/WebDriver/ChangeLog
>index 11c827022c7..076707f996b 100644
>--- a/Source/WebDriver/ChangeLog
>+++ b/Source/WebDriver/ChangeLog
>@@ -1,3 +1,19 @@
>+2019-01-03  Carlos Garcia Campos  <cgarcia@igalia.com>
>+
>+        [GLIB] WebDriver: browser close not correctly detected on session close in some cases
>+        https://bugs.webkit.org/show_bug.cgi?id=193104
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This happens when the dbus connection is closed right before the response to SendMessageToBackend message is
>+        going to be sent. In that case, g_dbus_connection_call async ready handler generates an error before the close
>+        signal is emitted. Then, the close commands try to handle the error checking if SessionHost::isConnected(), but
>+        it still returns true, because the browser is still alive, but the dbus connection has been closed.
>+
>+        * glib/SessionHostGlib.cpp:
>+        (WebDriver::SessionHost::isConnected const): Session is connected when launching or when dbus connection hasn't
>+        been closed.
>+
> 2018-12-21  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         [GLIB] WebDriver: dbusConnectionClosedCallback can be called after SessionHost has been deleted
>diff --git a/Source/WebDriver/glib/SessionHostGlib.cpp b/Source/WebDriver/glib/SessionHostGlib.cpp
>index 364ca80f893..34f9bca2b87 100644
>--- a/Source/WebDriver/glib/SessionHostGlib.cpp
>+++ b/Source/WebDriver/glib/SessionHostGlib.cpp
>@@ -108,7 +108,8 @@ void SessionHost::connectToBrowser(Function<void (Optional<String> error)>&& com
> 
> bool SessionHost::isConnected() const
> {
>-    return !!m_browser;
>+    // Session is connected when launching or when dbus connection hasn't been closed.
>+    return m_browser && (!m_dbusConnection || !g_dbus_connection_is_closed(m_dbusConnection.get()));
> }
> 
> struct ConnectToBrowserAsyncData {

Flags:

mcatanzaro: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 193104: 358252 | 358253