Changeset 264999 in webkit

Timestamp:

Jul 28, 2020 12:21:35 PM (4 years ago)

Author:

timothy@apple.com

Message:

Web Inspector: Don't allow docking to a hidden web view
​https://bugs.webkit.org/show_bug.cgi?id=214886

Reviewed by Devin Rousso.

• UIProcess/Inspector/WebInspectorProxy.cpp:

(WebKit::WebInspectorProxy::attach): Call platformCanAttach() since it can do a live check.
(WebKit::WebInspectorProxy::detach): Return early if already attached, otherwise asserts later.

• UIProcess/Inspector/mac/WebInspectorProxyMac.mm:

(WebKit::WebInspectorProxy::platformCanAttach): Return flase when the web view is hidden.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Inspector/WebInspectorProxy.cpp (modified) (2 diffs)
• UIProcess/Inspector/mac/WebInspectorProxyMac.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-07-28  Timothy Hatcher  <timothy@apple.com>
+
+        Web Inspector: Don't allow docking to a hidden web view
+        https://bugs.webkit.org/show_bug.cgi?id=214886
+
+        Reviewed by Devin Rousso.
+
+        * UIProcess/Inspector/WebInspectorProxy.cpp:
+        (WebKit::WebInspectorProxy::attach): Call platformCanAttach() since it can do a live check.
+        (WebKit::WebInspectorProxy::detach): Return early if already attached, otherwise asserts later.
+        * UIProcess/Inspector/mac/WebInspectorProxyMac.mm:
+        (WebKit::WebInspectorProxy::platformCanAttach): Return flase when the web view is hidden.
+
 2020-07-28  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/UIProcess/Inspector/WebInspectorProxy.cpp

@@ -280 +280 @@
 {
     ASSERT(m_inspectorPage);
-    if (!m_inspectedPage || !m_inspectorPage || !canAttach())
+    if (!m_inspectedPage || !m_inspectorPage || !platformCanAttach(canAttach()))
         return;
 
@@ -312 +312 @@
 void WebInspectorProxy::detach()
 {
-    if (!m_inspectedPage || !m_inspectorPage)
+    if (!m_inspectedPage || !m_inspectorPage || (!m_isAttached && m_isVisible))
         return;
 

trunk/Source/WebKit/UIProcess/Inspector/mac/WebInspectorProxyMac.mm

@@ -412 +412 @@
         return webProcessCanAttach;
 
+    if (inspectedView.hidden)
+        return false;
+
     static const float minimumAttachedHeight = 250;
     static const float maximumAttachedHeightRatio = 0.75;