Changeset 286498 in webkit

Timestamp:

Dec 3, 2021, 9:45:21 AM (5 years ago)

Author:

BJ Burg

Message:

Web Inspector: Web Inspector^{2 crashes after closing if Web Inspector}1 closed first
​https://bugs.webkit.org/show_bug.cgi?id=233293
<rdar://problem/85526508>

Reviewed by Devin Rousso.

Cache the inspected page's identifier. During frontend teardown, use the cached indentifier
to remove the message receiver that was added to receive messages from the inspected page.

Other operations using m_inspectedPage should be guarded in case that the inspected
page already been closed and destroyed.

• UIProcess/Inspector/WebInspectorUIProxy.cpp:

(WebKit::WebInspectorUIProxy::createFrontendPage):
(WebKit::WebInspectorUIProxy::closeFrontendPageAndWindow):

• UIProcess/Inspector/WebInspectorUIProxy.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Inspector/WebInspectorUIProxy.cpp (modified) (5 diffs)
• UIProcess/Inspector/WebInspectorUIProxy.h (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-12-03  BJ Burg  <bburg@apple.com>
+
+        Web Inspector: Web Inspector^2 crashes after closing if Web Inspector^1 closed first
+        https://bugs.webkit.org/show_bug.cgi?id=233293
+        <rdar://problem/85526508>
+
+        Reviewed by Devin Rousso.
+
+        Cache the inspected page's identifier. During frontend teardown, use the cached indentifier
+        to remove the message receiver that was added to receive messages from the inspected page.
+
+        Other operations using m_inspectedPage should be guarded in case that the inspected
+        page already been closed and destroyed.
+
+        * UIProcess/Inspector/WebInspectorUIProxy.cpp:
+        (WebKit::WebInspectorUIProxy::createFrontendPage):
+        (WebKit::WebInspectorUIProxy::closeFrontendPageAndWindow):
+        * UIProcess/Inspector/WebInspectorUIProxy.h:
+
+
 2021-12-03  BJ Burg  <bburg@apple.com>
 

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2010-2020 Apple Inc. All rights reserved.
+ * Copyright (C) 2010-2021 Apple Inc. All rights reserved.
  * Portions Copyright (c) 2011 Motorola Mobility, Inc.  All rights reserved.
  *
@@ -226 +226 @@
 
     m_inspectedPage = &inspectedPage;
+    m_inspectedPageIdentifier = m_inspectedPage->identifier();
+
     m_inspectedPage->process().addMessageReceiver(Messages::WebInspectorUIProxy::messageReceiverName(), m_inspectedPage->webPageID(), *this);
 
@@ -420 +422 @@
     m_inspectedPage->launchInitialProcessIfNecessary();
 
-    m_inspectorPage->process().addMessageReceiver(Messages::WebInspectorUIProxy::messageReceiverName(), m_inspectedPage->identifier(), *this);
+    m_inspectorPage->process().addMessageReceiver(Messages::WebInspectorUIProxy::messageReceiverName(), m_inspectedPageIdentifier, *this);
 
 #if ENABLE(INSPECTOR_EXTENSIONS)
@@ -530 +532 @@
     
     // Notify WebKit client when a local inspector closes so it can clear _WKInspectorDelegate and perform other cleanup.
-    m_inspectedPage->uiClient().willCloseLocalInspector(*m_inspectedPage, *this);
+    if (m_inspectedPage)
+        m_inspectedPage->uiClient().willCloseLocalInspector(*m_inspectedPage, *this);
 
     m_isVisible = false;
@@ -540 +543 @@
 
     m_inspectorPage->send(Messages::WebInspectorUI::SetIsVisible(m_isVisible));
-    m_inspectorPage->process().removeMessageReceiver(Messages::WebInspectorUIProxy::messageReceiverName(), m_inspectedPage->identifier());
-
-    if (m_isActiveFrontend) {
-        m_isActiveFrontend = false;
+    m_inspectorPage->process().removeMessageReceiver(Messages::WebInspectorUIProxy::messageReceiverName(), m_inspectedPageIdentifier);
+
+    if (m_inspectedPage && m_isActiveFrontend)
         m_inspectedPage->inspectorController().disconnectFrontend(*this);
-    }
+
+    m_isActiveFrontend = false;
 
     if (m_isAttached)

trunk/Source/WebKit/UIProcess/Inspector/WebInspectorUIProxy.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2010-2020 Apple Inc. All rights reserved.
+ * Copyright (C) 2010-2021 Apple Inc. All rights reserved.
  * Portions Copyright (c) 2011 Motorola Mobility, Inc.  All rights reserved.
  *
@@ -32 +32 @@
 #include "MessageReceiver.h"
 #include "WebInspectorUtilities.h"
+#include "WebPageProxyIdentifier.h"
 #include <JavaScriptCore/InspectorFrontendChannel.h>
 #include <WebCore/FloatRect.h>
@@ -289 +290 @@
     WebPageProxy* m_inspectorPage { nullptr };
     std::unique_ptr<API::InspectorClient> m_inspectorClient;
+    WebPageProxyIdentifier m_inspectedPageIdentifier;
 
 #if ENABLE(INSPECTOR_EXTENSIONS)