Changeset 285771 in webkit

Timestamp:

Nov 12, 2021, 7:22:14 PM (5 years ago)

Author:

timothy@apple.com

Message:

webView._isBeingInspected does not work with Service Worker pages
​https://bugs.webkit.org/show_bug.cgi?id=233062
rdar://problem/85354982

Reviewed by Devin Rousso.

• inspector/WorkerInspectorController.cpp:

(WebCore::WorkerInspectorController::connectFrontend): Call updateServiceWorkerPageFrontendCount().
(WebCore::WorkerInspectorController::disconnectFrontend): Ditto.
(WebCore::WorkerInspectorController::updateServiceWorkerPageFrontendCount): Added.

• inspector/WorkerInspectorController.h: Added updateServiceWorkerPageFrontendCount().

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/WorkerInspectorController.cpp (modified) (3 diffs)
• inspector/WorkerInspectorController.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-12  Timothy Hatcher  <timothy@apple.com>
+
+        webView._isBeingInspected does not work with Service Worker pages
+        https://bugs.webkit.org/show_bug.cgi?id=233062
+        rdar://problem/85354982
+
+        Reviewed by Devin Rousso.
+
+        * inspector/WorkerInspectorController.cpp:
+        (WebCore::WorkerInspectorController::connectFrontend): Call updateServiceWorkerPageFrontendCount().
+        (WebCore::WorkerInspectorController::disconnectFrontend): Ditto.
+        (WebCore::WorkerInspectorController::updateServiceWorkerPageFrontendCount): Added.
+        * inspector/WorkerInspectorController.h: Added updateServiceWorkerPageFrontendCount().
+
 2021-11-12  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/inspector/WorkerInspectorController.cpp

@@ -49 +49 @@
 
 #if ENABLE(SERVICE_WORKER)
+#include "InspectorClient.h"
+#include "Page.h"
 #include "ServiceWorkerAgent.h"
 #include "ServiceWorkerGlobalScope.h"
@@ -110 +112 @@
     m_frontendRouter->connectFrontend(*m_forwardingChannel.get());
     m_agents.didCreateFrontendAndBackend(&m_frontendRouter.get(), &m_backendDispatcher.get());
+
+#if ENABLE(SERVICE_WORKER)
+    updateServiceWorkerPageFrontendCount();
+#endif
 }
 
@@ -126 +132 @@
     m_frontendRouter->disconnectFrontend(*m_forwardingChannel.get());
     m_forwardingChannel = nullptr;
-}
+
+#if ENABLE(SERVICE_WORKER)
+    updateServiceWorkerPageFrontendCount();
+#endif
+}
+
+#if ENABLE(SERVICE_WORKER)
+void WorkerInspectorController::updateServiceWorkerPageFrontendCount()
+{
+    if (!is<ServiceWorkerGlobalScope>(m_globalScope))
+        return;
+
+    auto serviceWorkerPage = downcast<ServiceWorkerGlobalScope>(m_globalScope).serviceWorkerPage();
+    if (!serviceWorkerPage)
+        return;
+
+    ASSERT(isMainThread());
+
+    // When a service worker is loaded in a Page, we need to report its inspector frontend count
+    // up to the page's inspectorController so the client knows about it.
+    auto inspectorClient = serviceWorkerPage->inspectorController().inspectorClient();
+    if (!inspectorClient)
+        return;
+
+    inspectorClient->frontendCountChanged(m_frontendRouter->frontendCount());
+}
+#endif
 
 void WorkerInspectorController::dispatchMessageFromFrontend(const String& message)

trunk/Source/WebCore/inspector/WorkerInspectorController.h

@@ -75 +75 @@
     void createLazyAgents();
 
+#if ENABLE(SERVICE_WORKER)
+    void updateServiceWorkerPageFrontendCount();
+#endif
+
     Ref<InstrumentingAgents> m_instrumentingAgents;
     std::unique_ptr<WebInjectedScriptManager> m_injectedScriptManager;