Changeset 229523 in webkit

Timestamp:

Mar 12, 2018 2:10:23 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r229396 - REGRESSION(r218089): [GTK] webkit_web_view_get_inspector() needs to be called, otherwise inspector does not close
​https://bugs.webkit.org/show_bug.cgi?id=181126

Reviewed by Carlos Alberto Lopez Perez.

Fix the condition to decide whether to detach the inspector view ourselves.

• UIProcess/gtk/WebInspectorProxyGtk.cpp:

(WebKit::WebInspectorProxy::platformDetach): Remove the inspector view from its parent if we don't have a client
or the client didn't detach it.

Location:

releases/WebKitGTK/webkit-2.20/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/gtk/WebInspectorProxyGtk.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog

@@ +1 @@
+2018-03-07  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        REGRESSION(r218089): [GTK] webkit_web_view_get_inspector() needs to be called, otherwise inspector does not close
+        https://bugs.webkit.org/show_bug.cgi?id=181126
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        Fix the condition to decide whether to detach the inspector view ourselves.
+
+        * UIProcess/gtk/WebInspectorProxyGtk.cpp:
+        (WebKit::WebInspectorProxy::platformDetach): Remove the inspector view from its parent if we don't have a client
+        or the client didn't detach it.
+
 2018-03-06  Carlos Garcia Campos  <cgarcia@igalia.com>
 

releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/gtk/WebInspectorProxyGtk.cpp

@@ -397 +397 @@
 
     GRefPtr<GtkWidget> inspectorView = m_inspectorView;
-    if (m_client && !m_client->detach(*this)) {
+    if (!m_client || !m_client->detach(*this)) {
         // Detach is called when m_isAttached is true, but it could called before
         // the inspector is opened if the inspector is shown/closed quickly. So,