Changeset 287786 in webkit

Timestamp:

Jan 7, 2022, 2:46:50 PM (5 years ago)

Author:

Patrick Angle

Message:

REGRESSION(r286498): Web Inspector: Inspector^{2 fails to load in release builds and crashes with an assertion in debug builds
​https://bugs.webkit.org/show_bug.cgi?id=234968}

Reviewed by Devin Rousso.

Inspector^{2 would fail to open a local inspector frontend because m_inspectedPageIdentifier was not set before
it was used in WebInspectorUIProxy::createFrontendPage. To correct this, we now cache the inspected page
identifier immediately upon creating the WebInspectorUIProxy, instead of only in
WebInspectorUIProxy::updateForNewPageProcess. This also allows us to use the cached identifier in
WebInspectorUIProxy::openLocalInspectorFrontend as discussed in <​http://webkit.org/b/233293#c5>.}

• UIProcess/Inspector/WebInspectorUIProxy.cpp:

(WebKit::WebInspectorUIProxy::WebInspectorUIProxy):
(WebKit::WebInspectorUIProxy::openLocalInspectorFrontend):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Inspector/WebInspectorUIProxy.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2022-01-07  Patrick Angle  <pangle@apple.com>
+
+        REGRESSION(r286498): Web Inspector: Inspector^2 fails to load in release builds and crashes with an assertion in debug builds
+        https://bugs.webkit.org/show_bug.cgi?id=234968
+
+        Reviewed by Devin Rousso.
+
+        Inspector^2 would fail to open a local inspector frontend because m_inspectedPageIdentifier was not set before
+        it was used in `WebInspectorUIProxy::createFrontendPage`. To correct this, we now cache the inspected page
+        identifier immediately upon creating the WebInspectorUIProxy, instead of only in
+        `WebInspectorUIProxy::updateForNewPageProcess`. This also allows us to use the cached identifier in
+        `WebInspectorUIProxy::openLocalInspectorFrontend` as discussed in <http://webkit.org/b/233293#c5>.
+
+        * UIProcess/Inspector/WebInspectorUIProxy.cpp:
+        (WebKit::WebInspectorUIProxy::WebInspectorUIProxy):
+        (WebKit::WebInspectorUIProxy::openLocalInspectorFrontend):
+
 2022-01-07  Said Abou-Hallawa  <said@apple.com>
 

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

@@ -68 +68 @@
     : m_inspectedPage(&inspectedPage)
     , m_inspectorClient(makeUnique<API::InspectorClient>())
+    , m_inspectedPageIdentifier(inspectedPage.identifier())
 #if PLATFORM(MAC)
     , m_closeFrontendAfterInactivityTimer(RunLoop::main(), this, &WebInspectorUIProxy::closeFrontendAfterInactivityTimerFired)
@@ -449 +450 @@
         return;
 
-    m_inspectorPage->send(Messages::WebInspectorUI::EstablishConnection(m_inspectedPage->identifier(), infoForLocalDebuggable(), m_underTest, inspectionLevel()));
+    m_inspectorPage->send(Messages::WebInspectorUI::EstablishConnection(m_inspectedPageIdentifier, infoForLocalDebuggable(), m_underTest, inspectionLevel()));
 
     ASSERT(!m_isActiveFrontend);