Web Inspector: Pass Inspector::FrontendChannel as a reference connect/disconnect...

https://bugs.webkit.org/show_bug.cgi?id=191612

Reviewed by Matt Baker.

Source/JavaScriptCore:

* inspector/InspectorFrontendRouter.cpp:
(Inspector::FrontendRouter::connectFrontend):
(Inspector::FrontendRouter::disconnectFrontend):
* inspector/InspectorFrontendRouter.h:
* inspector/JSGlobalObjectInspectorController.cpp:
(Inspector::JSGlobalObjectInspectorController::connectFrontend):
(Inspector::JSGlobalObjectInspectorController::disconnectFrontend):
* inspector/JSGlobalObjectInspectorController.h:
* inspector/remote/RemoteControllableTarget.h:
* inspector/remote/cocoa/RemoteConnectionToTargetCocoa.mm:
(Inspector::RemoteConnectionToTarget::setup):
(Inspector::RemoteConnectionToTarget::close):
* inspector/remote/glib/RemoteConnectionToTargetGlib.cpp:
(Inspector::RemoteConnectionToTarget::setup):
(Inspector::RemoteConnectionToTarget::close):
* runtime/JSGlobalObjectDebuggable.cpp:
(JSC::JSGlobalObjectDebuggable::connect):
(JSC::JSGlobalObjectDebuggable::disconnect):
* runtime/JSGlobalObjectDebuggable.h:

Source/WebCore:

* inspector/InspectorController.cpp:
(WebCore::InspectorController::connectFrontend):
(WebCore::InspectorController::disconnectFrontend):
(WebCore::InspectorController::show):
* inspector/InspectorController.h:
* inspector/WorkerInspectorController.cpp:
(WebCore::WorkerInspectorController::connectFrontend):
(WebCore::WorkerInspectorController::disconnectFrontend):
* page/PageDebuggable.cpp:
(WebCore::PageDebuggable::connect):
(WebCore::PageDebuggable::disconnect):
* page/PageDebuggable.h:
* testing/Internals.cpp:
(WebCore::InspectorStubFrontend::InspectorStubFrontend):
(WebCore::InspectorStubFrontend::closeWindow):
* workers/service/context/ServiceWorkerDebuggable.cpp:
(WebCore::ServiceWorkerDebuggable::connect):
(WebCore::ServiceWorkerDebuggable::disconnect):
* workers/service/context/ServiceWorkerDebuggable.h:
* workers/service/context/ServiceWorkerInspectorProxy.cpp:
(WebCore::ServiceWorkerInspectorProxy::connectToWorker):
(WebCore::ServiceWorkerInspectorProxy::disconnectFromWorker):
* workers/service/context/ServiceWorkerInspectorProxy.h:

Source/WebKit:

* UIProcess/Automation/WebAutomationSession.cpp:
(WebKit::WebAutomationSession::connect):
(WebKit::WebAutomationSession::disconnect):
(WebKit::WebAutomationSession::terminate):
* UIProcess/Automation/WebAutomationSession.h:
* UIProcess/WebPageDebuggable.cpp:
(WebKit::WebPageDebuggable::connect):
(WebKit::WebPageDebuggable::disconnect):
* UIProcess/WebPageDebuggable.h:
* UIProcess/WebPageInspectorController.cpp:
(WebKit::WebPageInspectorController::connectFrontend):
(WebKit::WebPageInspectorController::disconnectFrontend):
* UIProcess/WebPageInspectorController.h:
* WebProcess/WebPage/WebInspector.cpp:
(WebKit::WebInspector::close):
* WebProcess/WebPage/WebPageInspectorTarget.cpp:
(WebKit::WebPageInspectorTarget::connect):
(WebKit::WebPageInspectorTarget::disconnect):

Source/WebKitLegacy/mac:

* WebCoreSupport/WebInspectorClient.mm:
(-[WebInspectorWindowController destroyInspectorView]):

Source/WebKitLegacy/win:

* WebCoreSupport/WebInspectorClient.cpp:
(WebInspectorFrontendClient::destroyInspectorView):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@238206 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 068fa03..a6b6883 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,5 +1,32 @@
 2018-11-14  Joseph Pecoraro  <pecoraro@apple.com>
 
+        Web Inspector: Pass Inspector::FrontendChannel as a reference connect/disconnect methods
+        https://bugs.webkit.org/show_bug.cgi?id=191612
+
+        Reviewed by Matt Baker.
+
+        * inspector/InspectorFrontendRouter.cpp:
+        (Inspector::FrontendRouter::connectFrontend):
+        (Inspector::FrontendRouter::disconnectFrontend):
+        * inspector/InspectorFrontendRouter.h:
+        * inspector/JSGlobalObjectInspectorController.cpp:
+        (Inspector::JSGlobalObjectInspectorController::connectFrontend):
+        (Inspector::JSGlobalObjectInspectorController::disconnectFrontend):
+        * inspector/JSGlobalObjectInspectorController.h:
+        * inspector/remote/RemoteControllableTarget.h:
+        * inspector/remote/cocoa/RemoteConnectionToTargetCocoa.mm:
+        (Inspector::RemoteConnectionToTarget::setup):
+        (Inspector::RemoteConnectionToTarget::close):
+        * inspector/remote/glib/RemoteConnectionToTargetGlib.cpp:
+        (Inspector::RemoteConnectionToTarget::setup):
+        (Inspector::RemoteConnectionToTarget::close):
+        * runtime/JSGlobalObjectDebuggable.cpp:
+        (JSC::JSGlobalObjectDebuggable::connect):
+        (JSC::JSGlobalObjectDebuggable::disconnect):
+        * runtime/JSGlobalObjectDebuggable.h:
+
+2018-11-14  Joseph Pecoraro  <pecoraro@apple.com>
+
         Web Inspector: Keep Web Inspector window alive across process swaps (PSON) (Remote Inspector)
         https://bugs.webkit.org/show_bug.cgi?id=191494
         <rdar://problem/45469854>

diff --git a/Source/JavaScriptCore/inspector/InspectorFrontendRouter.cpp b/Source/JavaScriptCore/inspector/InspectorFrontendRouter.cpp
index 65f8525..d408d36 100644 (file)
--- a/Source/JavaScriptCore/inspector/InspectorFrontendRouter.cpp
+++ b/Source/JavaScriptCore/inspector/InspectorFrontendRouter.cpp
@@ -36,28 +36,24 @@ Ref<FrontendRouter> FrontendRouter::create()
     return adoptRef(*new FrontendRouter);
 }
 
-void FrontendRouter::connectFrontend(FrontendChannel* connection)
+void FrontendRouter::connectFrontend(FrontendChannel& connection)
 {
-    ASSERT_ARG(connection, connection);
-
-    if (m_connections.contains(connection)) {
+    if (m_connections.contains(&connection)) {
         ASSERT_NOT_REACHED();
         return;
     }
 
-    m_connections.append(connection);
+    m_connections.append(&connection);
 }
 
-void FrontendRouter::disconnectFrontend(FrontendChannel* connection)
+void FrontendRouter::disconnectFrontend(FrontendChannel& connection)
 {
-    ASSERT_ARG(connection, connection);
-
-    if (!m_connections.contains(connection)) {
+    if (!m_connections.contains(&connection)) {
         ASSERT_NOT_REACHED();
         return;
     }
 
-    m_connections.removeFirst(connection);
+    m_connections.removeFirst(&connection);
 }
 
 void FrontendRouter::disconnectAllFrontends()

diff --git a/Source/JavaScriptCore/inspector/InspectorFrontendRouter.h b/Source/JavaScriptCore/inspector/InspectorFrontendRouter.h
index ee65b2f..3d3c045 100644 (file)
--- a/Source/JavaScriptCore/inspector/InspectorFrontendRouter.h
+++ b/Source/JavaScriptCore/inspector/InspectorFrontendRouter.h
@@ -43,8 +43,8 @@ public:
 
     unsigned frontendCount() const { return m_connections.size(); }
 
-    void connectFrontend(FrontendChannel*);
-    void disconnectFrontend(FrontendChannel*);
+    void connectFrontend(FrontendChannel&);
+    void disconnectFrontend(FrontendChannel&);
     void disconnectAllFrontends();
 
     void sendEvent(const String& message) const;

diff --git a/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp b/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp
index d4d7aa1..ad45f6f 100644 (file)
--- a/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp
+++ b/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp
@@ -119,10 +119,8 @@ void JSGlobalObjectInspectorController::globalObjectDestroyed()
     m_agents.discardValues();
 }
 
-void JSGlobalObjectInspectorController::connectFrontend(FrontendChannel* frontendChannel, bool isAutomaticInspection, bool immediatelyPause)
+void JSGlobalObjectInspectorController::connectFrontend(FrontendChannel& frontendChannel, bool isAutomaticInspection, bool immediatelyPause)
 {
-    ASSERT_ARG(frontendChannel, frontendChannel);
-
     m_isAutomaticInspection = isAutomaticInspection;
     m_pauseAfterInitialization = immediatelyPause;
 
@@ -147,10 +145,8 @@ void JSGlobalObjectInspectorController::connectFrontend(FrontendChannel* fronten
 #endif
 }
 
-void JSGlobalObjectInspectorController::disconnectFrontend(FrontendChannel* frontendChannel)
+void JSGlobalObjectInspectorController::disconnectFrontend(FrontendChannel& frontendChannel)
 {
-    ASSERT_ARG(frontendChannel, frontendChannel);
-
     // FIXME: change this to notify agents which frontend has disconnected (by id).
     m_agents.willDestroyFrontendAndBackend(DisconnectReason::InspectorDestroyed);
 

diff --git a/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h b/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h
index 8fb6cbb..c2188d8 100644 (file)
--- a/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h
+++ b/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h
@@ -68,8 +68,8 @@ public:
     JSGlobalObjectInspectorController(JSC::JSGlobalObject&);
     ~JSGlobalObjectInspectorController();
 
-    void connectFrontend(FrontendChannel*, bool isAutomaticInspection, bool immediatelyPause);
-    void disconnectFrontend(FrontendChannel*);
+    void connectFrontend(FrontendChannel&, bool isAutomaticInspection, bool immediatelyPause);
+    void disconnectFrontend(FrontendChannel&);
 
     void dispatchMessageFromFrontend(const String&);
 

diff --git a/Source/JavaScriptCore/inspector/remote/RemoteControllableTarget.h b/Source/JavaScriptCore/inspector/remote/RemoteControllableTarget.h
index 8ab6d76..4bbb6a4 100644 (file)
--- a/Source/JavaScriptCore/inspector/remote/RemoteControllableTarget.h
+++ b/Source/JavaScriptCore/inspector/remote/RemoteControllableTarget.h
@@ -45,8 +45,8 @@ public:
     void init();
     void update();
 
-    virtual void connect(FrontendChannel*, bool isAutomaticConnection = false, bool immediatelyPause = false) = 0;
-    virtual void disconnect(FrontendChannel*) = 0;
+    virtual void connect(FrontendChannel&, bool isAutomaticConnection = false, bool immediatelyPause = false) = 0;
+    virtual void disconnect(FrontendChannel&) = 0;
 
     unsigned targetIdentifier() const { return m_identifier; }
     void setTargetIdentifier(unsigned identifier) { m_identifier = identifier; }

diff --git a/Source/JavaScriptCore/inspector/remote/cocoa/RemoteConnectionToTargetCocoa.mm b/Source/JavaScriptCore/inspector/remote/cocoa/RemoteConnectionToTargetCocoa.mm
index 09b5f6a..4a34269 100644 (file)
--- a/Source/JavaScriptCore/inspector/remote/cocoa/RemoteConnectionToTargetCocoa.mm
+++ b/Source/JavaScriptCore/inspector/remote/cocoa/RemoteConnectionToTargetCocoa.mm
@@ -171,13 +171,13 @@ bool RemoteConnectionToTarget::setup(bool isAutomaticInspection, bool automatica
                 m_target = nullptr;
             } else if (is<RemoteInspectionTarget>(m_target)) {
                 auto castedTarget = downcast<RemoteInspectionTarget>(m_target);
-                castedTarget->connect(this, isAutomaticInspection, automaticallyPause);
+                castedTarget->connect(*this, isAutomaticInspection, automaticallyPause);
                 m_connected = true;
 
                 RemoteInspector::singleton().updateTargetListing(targetIdentifier);
             } else if (is<RemoteAutomationTarget>(m_target)) {
                 auto castedTarget = downcast<RemoteAutomationTarget>(m_target);
-                castedTarget->connect(this);
+                castedTarget->connect(*this);
                 m_connected = true;
 
                 RemoteInspector::singleton().updateTargetListing(targetIdentifier);
@@ -206,7 +206,7 @@ void RemoteConnectionToTarget::close()
             std::lock_guard<Lock> lock(m_targetMutex);
             if (m_target) {
                 if (m_connected)
-                    m_target->disconnect(this);
+                    m_target->disconnect(*this);
 
                 m_target = nullptr;
                 

diff --git a/Source/JavaScriptCore/inspector/remote/glib/RemoteConnectionToTargetGlib.cpp b/Source/JavaScriptCore/inspector/remote/glib/RemoteConnectionToTargetGlib.cpp
index c66b559..13e3930 100644 (file)
--- a/Source/JavaScriptCore/inspector/remote/glib/RemoteConnectionToTargetGlib.cpp
+++ b/Source/JavaScriptCore/inspector/remote/glib/RemoteConnectionToTargetGlib.cpp
@@ -56,13 +56,13 @@ bool RemoteConnectionToTarget::setup(bool isAutomaticInspection, bool automatica
         m_target = nullptr;
     } else if (is<RemoteInspectionTarget>(m_target)) {
         auto target = downcast<RemoteInspectionTarget>(m_target);
-        target->connect(this, isAutomaticInspection, automaticallyPause);
+        target->connect(*this, isAutomaticInspection, automaticallyPause);
         m_connected = true;
 
         RemoteInspector::singleton().updateTargetListing(targetIdentifier);
     } else if (is<RemoteAutomationTarget>(m_target)) {
         auto target = downcast<RemoteAutomationTarget>(m_target);
-        target->connect(this);
+        target->connect(*this);
         m_connected = true;
 
         RemoteInspector::singleton().updateTargetListing(targetIdentifier);
@@ -93,7 +93,7 @@ void RemoteConnectionToTarget::close()
     unsigned targetIdentifier = m_target->targetIdentifier();
 
     if (m_connected)
-        m_target->disconnect(this);
+        m_target->disconnect(*this);
 
     m_target = nullptr;
 

diff --git a/Source/JavaScriptCore/runtime/JSGlobalObjectDebuggable.cpp b/Source/JavaScriptCore/runtime/JSGlobalObjectDebuggable.cpp
index f05360c..37d3c28 100644 (file)
--- a/Source/JavaScriptCore/runtime/JSGlobalObjectDebuggable.cpp
+++ b/Source/JavaScriptCore/runtime/JSGlobalObjectDebuggable.cpp
@@ -50,14 +50,14 @@ String JSGlobalObjectDebuggable::name() const
     return name.isEmpty() ? "JSContext"_s : name;
 }
 
-void JSGlobalObjectDebuggable::connect(FrontendChannel* frontendChannel, bool automaticInspection, bool immediatelyPause)
+void JSGlobalObjectDebuggable::connect(FrontendChannel& frontendChannel, bool automaticInspection, bool immediatelyPause)
 {
     JSLockHolder locker(&m_globalObject.vm());
 
     m_globalObject.inspectorController().connectFrontend(frontendChannel, automaticInspection, immediatelyPause);
 }
 
-void JSGlobalObjectDebuggable::disconnect(FrontendChannel* frontendChannel)
+void JSGlobalObjectDebuggable::disconnect(FrontendChannel& frontendChannel)
 {
     JSLockHolder locker(&m_globalObject.vm());
 

diff --git a/Source/JavaScriptCore/runtime/JSGlobalObjectDebuggable.h b/Source/JavaScriptCore/runtime/JSGlobalObjectDebuggable.h
index 0579909..7cbc0c2 100644 (file)
--- a/Source/JavaScriptCore/runtime/JSGlobalObjectDebuggable.h
+++ b/Source/JavaScriptCore/runtime/JSGlobalObjectDebuggable.h
@@ -51,8 +51,8 @@ public:
     String name() const final;
     bool hasLocalDebugger() const final { return false; }
 
-    void connect(Inspector::FrontendChannel*, bool isAutomaticConnection = false, bool immediatelyPause = false) final;
-    void disconnect(Inspector::FrontendChannel*) final;
+    void connect(Inspector::FrontendChannel&, bool isAutomaticConnection = false, bool immediatelyPause = false) final;
+    void disconnect(Inspector::FrontendChannel&) final;
     void dispatchMessageFromRemote(const String& message) final;
 
     bool automaticInspectionAllowed() const final { return true; }

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 262e979..7b0b090 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,34 @@
+2018-11-14  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Pass Inspector::FrontendChannel as a reference connect/disconnect methods
+        https://bugs.webkit.org/show_bug.cgi?id=191612
+
+        Reviewed by Matt Baker.
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::connectFrontend):
+        (WebCore::InspectorController::disconnectFrontend):
+        (WebCore::InspectorController::show):
+        * inspector/InspectorController.h:
+        * inspector/WorkerInspectorController.cpp:
+        (WebCore::WorkerInspectorController::connectFrontend):
+        (WebCore::WorkerInspectorController::disconnectFrontend):
+        * page/PageDebuggable.cpp:
+        (WebCore::PageDebuggable::connect):
+        (WebCore::PageDebuggable::disconnect):
+        * page/PageDebuggable.h:
+        * testing/Internals.cpp:
+        (WebCore::InspectorStubFrontend::InspectorStubFrontend):
+        (WebCore::InspectorStubFrontend::closeWindow):
+        * workers/service/context/ServiceWorkerDebuggable.cpp:
+        (WebCore::ServiceWorkerDebuggable::connect):
+        (WebCore::ServiceWorkerDebuggable::disconnect):
+        * workers/service/context/ServiceWorkerDebuggable.h:
+        * workers/service/context/ServiceWorkerInspectorProxy.cpp:
+        (WebCore::ServiceWorkerInspectorProxy::connectToWorker):
+        (WebCore::ServiceWorkerInspectorProxy::disconnectFromWorker):
+        * workers/service/context/ServiceWorkerInspectorProxy.h:
+
 2018-11-14  Timothy Hatcher  <timothy@apple.com>
 
         Update prefers-color-scheme media query matching based on GitHub issue #3278.

diff --git a/Source/WebCore/inspector/InspectorController.cpp b/Source/WebCore/inspector/InspectorController.cpp
index e6d4b02..44aa81b 100644 (file)
--- a/Source/WebCore/inspector/InspectorController.cpp
+++ b/Source/WebCore/inspector/InspectorController.cpp
@@ -254,9 +254,8 @@ void InspectorController::didClearWindowObjectInWorld(Frame& frame, DOMWrapperWo
         m_inspectorFrontendClient->windowObjectCleared();
 }
 
-void InspectorController::connectFrontend(Inspector::FrontendChannel* frontendChannel, bool isAutomaticInspection, bool immediatelyPause)
+void InspectorController::connectFrontend(Inspector::FrontendChannel& frontendChannel, bool isAutomaticInspection, bool immediatelyPause)
 {
-    ASSERT_ARG(frontendChannel, frontendChannel);
     ASSERT(m_inspectorClient);
 
     // If a frontend has connected enable the developer extras and keep them enabled.
@@ -285,7 +284,7 @@ void InspectorController::connectFrontend(Inspector::FrontendChannel* frontendCh
 #endif
 }
 
-void InspectorController::disconnectFrontend(FrontendChannel* frontendChannel)
+void InspectorController::disconnectFrontend(FrontendChannel& frontendChannel)
 {
     m_frontendRouter->disconnectFrontend(frontendChannel);
 
@@ -362,7 +361,7 @@ void InspectorController::show()
     if (m_frontendRouter->hasLocalFrontend())
         m_inspectorClient->bringFrontendToFront();
     else if (Inspector::FrontendChannel* frontendChannel = m_inspectorClient->openLocalFrontend(this))
-        connectFrontend(frontendChannel);
+        connectFrontend(*frontendChannel);
 }
 
 void InspectorController::setIsUnderTest(bool value)

diff --git a/Source/WebCore/inspector/InspectorController.h b/Source/WebCore/inspector/InspectorController.h
index 9fdd3b7..492fc8a 100644 (file)
--- a/Source/WebCore/inspector/InspectorController.h
+++ b/Source/WebCore/inspector/InspectorController.h
@@ -91,8 +91,8 @@ public:
     bool hasLocalFrontend() const;
     bool hasRemoteFrontend() const;
 
-    WEBCORE_EXPORT void connectFrontend(Inspector::FrontendChannel*, bool isAutomaticInspection = false, bool immediatelyPause = false);
-    WEBCORE_EXPORT void disconnectFrontend(Inspector::FrontendChannel*);
+    WEBCORE_EXPORT void connectFrontend(Inspector::FrontendChannel&, bool isAutomaticInspection = false, bool immediatelyPause = false);
+    WEBCORE_EXPORT void disconnectFrontend(Inspector::FrontendChannel&);
     WEBCORE_EXPORT void disconnectAllFrontends();
 
     void inspect(Node*);

diff --git a/Source/WebCore/inspector/WorkerInspectorController.cpp b/Source/WebCore/inspector/WorkerInspectorController.cpp
index e5c7458..d2c023f 100644 (file)
--- a/Source/WebCore/inspector/WorkerInspectorController.cpp
+++ b/Source/WebCore/inspector/WorkerInspectorController.cpp
@@ -114,7 +114,7 @@ void WorkerInspectorController::connectFrontend()
     m_executionStopwatch->start();
 
     m_forwardingChannel = std::make_unique<WorkerToPageFrontendChannel>(m_workerGlobalScope);
-    m_frontendRouter->connectFrontend(m_forwardingChannel.get());
+    m_frontendRouter->connectFrontend(*m_forwardingChannel.get());
     m_agents.didCreateFrontendAndBackend(&m_frontendRouter.get(), &m_backendDispatcher.get());
 }
 
@@ -130,7 +130,7 @@ void WorkerInspectorController::disconnectFrontend(Inspector::DisconnectReason r
     });
 
     m_agents.willDestroyFrontendAndBackend(reason);
-    m_frontendRouter->disconnectFrontend(m_forwardingChannel.get());
+    m_frontendRouter->disconnectFrontend(*m_forwardingChannel.get());
     m_forwardingChannel = nullptr;
 }
 

diff --git a/Source/WebCore/page/PageDebuggable.cpp b/Source/WebCore/page/PageDebuggable.cpp
index 32e4cb7..d9cde4f 100644 (file)
--- a/Source/WebCore/page/PageDebuggable.cpp
+++ b/Source/WebCore/page/PageDebuggable.cpp
@@ -69,16 +69,14 @@ bool PageDebuggable::hasLocalDebugger() const
     return m_page.inspectorController().hasLocalFrontend();
 }
 
-void PageDebuggable::connect(Inspector::FrontendChannel* channel, bool isAutomaticConnection, bool immediatelyPause)
+void PageDebuggable::connect(FrontendChannel& channel, bool isAutomaticConnection, bool immediatelyPause)
 {
-    InspectorController& inspectorController = m_page.inspectorController();
-    inspectorController.connectFrontend(channel, isAutomaticConnection, immediatelyPause);
+    m_page.inspectorController().connectFrontend(channel, isAutomaticConnection, immediatelyPause);
 }
 
-void PageDebuggable::disconnect(Inspector::FrontendChannel* channel)
+void PageDebuggable::disconnect(FrontendChannel& channel)
 {
-    InspectorController& inspectorController = m_page.inspectorController();
-    inspectorController.disconnectFrontend(channel);
+    m_page.inspectorController().disconnectFrontend(channel);
 }
 
 void PageDebuggable::dispatchMessageFromRemote(const String& message)

diff --git a/Source/WebCore/page/PageDebuggable.h b/Source/WebCore/page/PageDebuggable.h
index 100929b..5cb0511 100644 (file)
--- a/Source/WebCore/page/PageDebuggable.h
+++ b/Source/WebCore/page/PageDebuggable.h
@@ -47,8 +47,8 @@ public:
     String url() const final;
     bool hasLocalDebugger() const final;
 
-    void connect(Inspector::FrontendChannel*, bool isAutomaticConnection = false, bool immediatelyPause = false) final;
-    void disconnect(Inspector::FrontendChannel*) final;
+    void connect(Inspector::FrontendChannel&, bool isAutomaticConnection = false, bool immediatelyPause = false) final;
+    void disconnect(Inspector::FrontendChannel&) final;
     void dispatchMessageFromRemote(const String& message) final;
     void setIndicating(bool) final;
 

diff --git a/Source/WebCore/testing/Internals.cpp b/Source/WebCore/testing/Internals.cpp
index 8a32051..9c9b4fe 100644 (file)
--- a/Source/WebCore/testing/Internals.cpp
+++ b/Source/WebCore/testing/Internals.cpp
@@ -335,7 +335,7 @@ InspectorStubFrontend::InspectorStubFrontend(Page& inspectedPage, RefPtr<DOMWind
     ASSERT_ARG(frontendWindow, frontendWindow);
 
     m_frontendController.setInspectorFrontendClient(this);
-    inspectedPage.inspectorController().connectFrontend(this);
+    inspectedPage.inspectorController().connectFrontend(*this);
 }
 
 InspectorStubFrontend::~InspectorStubFrontend()
@@ -349,7 +349,7 @@ void InspectorStubFrontend::closeWindow()
         return;
 
     m_frontendController.setInspectorFrontendClient(nullptr);
-    inspectedPage()->inspectorController().disconnectFrontend(this);
+    inspectedPage()->inspectorController().disconnectFrontend(*this);
 
     m_frontendWindow->close();
     m_frontendWindow = nullptr;

diff --git a/Source/WebCore/workers/service/context/ServiceWorkerDebuggable.cpp b/Source/WebCore/workers/service/context/ServiceWorkerDebuggable.cpp
index 551e39a..9a3832a 100644 (file)
--- a/Source/WebCore/workers/service/context/ServiceWorkerDebuggable.cpp
+++ b/Source/WebCore/workers/service/context/ServiceWorkerDebuggable.cpp
@@ -42,12 +42,12 @@ ServiceWorkerDebuggable::ServiceWorkerDebuggable(ServiceWorkerThreadProxy& servi
 {
 }
 
-void ServiceWorkerDebuggable::connect(Inspector::FrontendChannel* channel, bool, bool)
+void ServiceWorkerDebuggable::connect(FrontendChannel& channel, bool, bool)
 {
     m_serviceWorkerThreadProxy.inspectorProxy().connectToWorker(channel);
 }
 
-void ServiceWorkerDebuggable::disconnect(Inspector::FrontendChannel* channel)
+void ServiceWorkerDebuggable::disconnect(FrontendChannel& channel)
 {
     m_serviceWorkerThreadProxy.inspectorProxy().disconnectFromWorker(channel);
 }

diff --git a/Source/WebCore/workers/service/context/ServiceWorkerDebuggable.h b/Source/WebCore/workers/service/context/ServiceWorkerDebuggable.h
index 4bcd071..59bfc3c 100644 (file)
--- a/Source/WebCore/workers/service/context/ServiceWorkerDebuggable.h
+++ b/Source/WebCore/workers/service/context/ServiceWorkerDebuggable.h
@@ -49,8 +49,8 @@ public:
     String url() const final { return m_scopeURL; }
     bool hasLocalDebugger() const final { return false; }
 
-    void connect(Inspector::FrontendChannel*, bool isAutomaticConnection = false, bool immediatelyPause = false) final;
-    void disconnect(Inspector::FrontendChannel*) final;
+    void connect(Inspector::FrontendChannel&, bool isAutomaticConnection = false, bool immediatelyPause = false) final;
+    void disconnect(Inspector::FrontendChannel&) final;
     void dispatchMessageFromRemote(const String& message) final;
 
 private:

diff --git a/Source/WebCore/workers/service/context/ServiceWorkerInspectorProxy.cpp b/Source/WebCore/workers/service/context/ServiceWorkerInspectorProxy.cpp
index 63c72e5..5f0f1ee 100644 (file)
--- a/Source/WebCore/workers/service/context/ServiceWorkerInspectorProxy.cpp
+++ b/Source/WebCore/workers/service/context/ServiceWorkerInspectorProxy.cpp
@@ -57,18 +57,18 @@ void ServiceWorkerInspectorProxy::serviceWorkerTerminated()
     m_channel = nullptr;
 }
 
-void ServiceWorkerInspectorProxy::connectToWorker(FrontendChannel* channel)
+void ServiceWorkerInspectorProxy::connectToWorker(FrontendChannel& channel)
 {
-    m_channel = channel;
+    m_channel = &channel;
 
     m_serviceWorkerThreadProxy.thread().runLoop().postTaskForMode([] (ScriptExecutionContext& context) {
         downcast<WorkerGlobalScope>(context).inspectorController().connectFrontend();
     }, WorkerRunLoop::debuggerMode());
 }
 
-void ServiceWorkerInspectorProxy::disconnectFromWorker(FrontendChannel* channel)
+void ServiceWorkerInspectorProxy::disconnectFromWorker(FrontendChannel& channel)
 {
-    ASSERT_UNUSED(channel, channel == m_channel);
+    ASSERT_UNUSED(channel, &channel == m_channel);
     m_channel = nullptr;
 
     m_serviceWorkerThreadProxy.thread().runLoop().postTaskForMode([] (ScriptExecutionContext& context) {

diff --git a/Source/WebCore/workers/service/context/ServiceWorkerInspectorProxy.h b/Source/WebCore/workers/service/context/ServiceWorkerInspectorProxy.h
index 0c7ebcd..6aa874e 100644 (file)
--- a/Source/WebCore/workers/service/context/ServiceWorkerInspectorProxy.h
+++ b/Source/WebCore/workers/service/context/ServiceWorkerInspectorProxy.h
@@ -49,8 +49,8 @@ public:
 
     void serviceWorkerTerminated();
 
-    void connectToWorker(Inspector::FrontendChannel*);
-    void disconnectFromWorker(Inspector::FrontendChannel*);
+    void connectToWorker(Inspector::FrontendChannel&);
+    void disconnectFromWorker(Inspector::FrontendChannel&);
     void sendMessageToWorker(const String&);
     void sendMessageFromWorkerToFrontend(const String&);
 

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index aae4a60..d66e5f2 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,5 +1,31 @@
 2018-11-14  Joseph Pecoraro  <pecoraro@apple.com>
 
+        Web Inspector: Pass Inspector::FrontendChannel as a reference connect/disconnect methods
+        https://bugs.webkit.org/show_bug.cgi?id=191612
+
+        Reviewed by Matt Baker.
+
+        * UIProcess/Automation/WebAutomationSession.cpp:
+        (WebKit::WebAutomationSession::connect):
+        (WebKit::WebAutomationSession::disconnect):
+        (WebKit::WebAutomationSession::terminate):
+        * UIProcess/Automation/WebAutomationSession.h:
+        * UIProcess/WebPageDebuggable.cpp:
+        (WebKit::WebPageDebuggable::connect):
+        (WebKit::WebPageDebuggable::disconnect):
+        * UIProcess/WebPageDebuggable.h:
+        * UIProcess/WebPageInspectorController.cpp:
+        (WebKit::WebPageInspectorController::connectFrontend):
+        (WebKit::WebPageInspectorController::disconnectFrontend):
+        * UIProcess/WebPageInspectorController.h:
+        * WebProcess/WebPage/WebInspector.cpp:
+        (WebKit::WebInspector::close):
+        * WebProcess/WebPage/WebPageInspectorTarget.cpp:
+        (WebKit::WebPageInspectorTarget::connect):
+        (WebKit::WebPageInspectorTarget::disconnect):
+
+2018-11-14  Joseph Pecoraro  <pecoraro@apple.com>
+
         Unreviewed attempted wincairo build fix after 238192.
 
         * WebProcess/WebPage/WebPageInspectorTargetController.h:

diff --git a/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp b/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp
index a7b1831..bba73da 100644 (file)
--- a/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp
+++ b/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp
@@ -118,20 +118,20 @@ void WebAutomationSession::dispatchMessageFromRemote(const String& message)
     m_backendDispatcher->dispatch(message);
 }
 
-void WebAutomationSession::connect(Inspector::FrontendChannel* channel, bool isAutomaticConnection, bool immediatelyPause)
+void WebAutomationSession::connect(Inspector::FrontendChannel& channel, bool isAutomaticConnection, bool immediatelyPause)
 {
     UNUSED_PARAM(isAutomaticConnection);
     UNUSED_PARAM(immediatelyPause);
 
-    m_remoteChannel = channel;
+    m_remoteChannel = &channel;
     m_frontendRouter->connectFrontend(channel);
 
     setIsPaired(true);
 }
 
-void WebAutomationSession::disconnect(Inspector::FrontendChannel* channel)
+void WebAutomationSession::disconnect(Inspector::FrontendChannel& channel)
 {
-    ASSERT(channel == m_remoteChannel);
+    ASSERT(&channel == m_remoteChannel);
     terminate();
 }
 
@@ -152,7 +152,7 @@ void WebAutomationSession::terminate()
 #if ENABLE(REMOTE_INSPECTOR)
     if (Inspector::FrontendChannel* channel = m_remoteChannel) {
         m_remoteChannel = nullptr;
-        m_frontendRouter->disconnectFrontend(channel);
+        m_frontendRouter->disconnectFrontend(*channel);
     }
 
     setIsPaired(false);

diff --git a/Source/WebKit/UIProcess/Automation/WebAutomationSession.h b/Source/WebKit/UIProcess/Automation/WebAutomationSession.h
index 5b20157..c700045 100644 (file)
--- a/Source/WebKit/UIProcess/Automation/WebAutomationSession.h
+++ b/Source/WebKit/UIProcess/Automation/WebAutomationSession.h
@@ -130,8 +130,8 @@ public:
     // Inspector::RemoteAutomationTarget API
     String name() const override { return m_sessionIdentifier; }
     void dispatchMessageFromRemote(const String& message) override;
-    void connect(Inspector::FrontendChannel*, bool isAutomaticConnection = false, bool immediatelyPause = false) override;
-    void disconnect(Inspector::FrontendChannel*) override;
+    void connect(Inspector::FrontendChannel&, bool isAutomaticConnection = false, bool immediatelyPause = false) override;
+    void disconnect(Inspector::FrontendChannel&) override;
 #endif
     void terminate();
 

diff --git a/Source/WebKit/UIProcess/WebPageDebuggable.cpp b/Source/WebKit/UIProcess/WebPageDebuggable.cpp
index f32c8da..166417b 100644 (file)
--- a/Source/WebKit/UIProcess/WebPageDebuggable.cpp
+++ b/Source/WebKit/UIProcess/WebPageDebuggable.cpp
@@ -66,12 +66,12 @@ bool WebPageDebuggable::hasLocalDebugger() const
     return m_page.inspectorController().hasLocalFrontend();
 }
 
-void WebPageDebuggable::connect(Inspector::FrontendChannel* channel, bool isAutomaticConnection, bool immediatelyPause)
+void WebPageDebuggable::connect(FrontendChannel& channel, bool isAutomaticConnection, bool immediatelyPause)
 {
     m_page.inspectorController().connectFrontend(channel, isAutomaticConnection, immediatelyPause);
 }
 
-void WebPageDebuggable::disconnect(Inspector::FrontendChannel* channel)
+void WebPageDebuggable::disconnect(FrontendChannel& channel)
 {
     m_page.inspectorController().disconnectFrontend(channel);
 }

diff --git a/Source/WebKit/UIProcess/WebPageDebuggable.h b/Source/WebKit/UIProcess/WebPageDebuggable.h
index ab214bd..9f8df70 100644 (file)
--- a/Source/WebKit/UIProcess/WebPageDebuggable.h
+++ b/Source/WebKit/UIProcess/WebPageDebuggable.h
@@ -47,8 +47,8 @@ public:
     String url() const final;
     bool hasLocalDebugger() const final;
 
-    void connect(Inspector::FrontendChannel*, bool isAutomaticConnection = false, bool immediatelyPause = false) final;
-    void disconnect(Inspector::FrontendChannel*) final;
+    void connect(Inspector::FrontendChannel&, bool isAutomaticConnection = false, bool immediatelyPause = false) final;
+    void disconnect(Inspector::FrontendChannel&) final;
     void dispatchMessageFromRemote(const String& message) final;
     void setIndicating(bool) final;
 

diff --git a/Source/WebKit/UIProcess/WebPageInspectorController.cpp b/Source/WebKit/UIProcess/WebPageInspectorController.cpp
index 797420c..c4b92c8 100644 (file)
--- a/Source/WebKit/UIProcess/WebPageInspectorController.cpp
+++ b/Source/WebKit/UIProcess/WebPageInspectorController.cpp
@@ -62,10 +62,8 @@ bool WebPageInspectorController::hasLocalFrontend() const
     return m_frontendRouter->hasLocalFrontend();
 }
 
-void WebPageInspectorController::connectFrontend(Inspector::FrontendChannel* frontendChannel, bool, bool)
+void WebPageInspectorController::connectFrontend(Inspector::FrontendChannel& frontendChannel, bool, bool)
 {
-    ASSERT_ARG(frontendChannel, frontendChannel);
-
     bool connectingFirstFrontend = !m_frontendRouter->hasFrontends();
 
     m_frontendRouter->connectFrontend(frontendChannel);
@@ -81,7 +79,7 @@ void WebPageInspectorController::connectFrontend(Inspector::FrontendChannel* fro
 #endif
 }
 
-void WebPageInspectorController::disconnectFrontend(FrontendChannel* frontendChannel)
+void WebPageInspectorController::disconnectFrontend(FrontendChannel& frontendChannel)
 {
     m_frontendRouter->disconnectFrontend(frontendChannel);
 

diff --git a/Source/WebKit/UIProcess/WebPageInspectorController.h b/Source/WebKit/UIProcess/WebPageInspectorController.h
index 2c91e02..0caf6a1 100644 (file)
--- a/Source/WebKit/UIProcess/WebPageInspectorController.h
+++ b/Source/WebKit/UIProcess/WebPageInspectorController.h
@@ -50,8 +50,8 @@ public:
 
     bool hasLocalFrontend() const;
 
-    void connectFrontend(Inspector::FrontendChannel*, bool isAutomaticInspection = false, bool immediatelyPause = false);
-    void disconnectFrontend(Inspector::FrontendChannel*);
+    void connectFrontend(Inspector::FrontendChannel&, bool isAutomaticInspection = false, bool immediatelyPause = false);
+    void disconnectFrontend(Inspector::FrontendChannel&);
     void disconnectAllFrontends();
 
     void dispatchMessageFromFrontend(const String& message);

diff --git a/Source/WebKit/WebProcess/WebPage/WebInspector.cpp b/Source/WebKit/WebProcess/WebPage/WebInspector.cpp
index b32737a..2daa636 100644 (file)
--- a/Source/WebKit/WebProcess/WebPage/WebInspector.cpp
+++ b/Source/WebKit/WebProcess/WebPage/WebInspector.cpp
@@ -145,7 +145,7 @@ void WebInspector::close()
     if (!m_frontendConnection)
         return;
 
-    m_page->corePage()->inspectorController().disconnectFrontend(this);
+    m_page->corePage()->inspectorController().disconnectFrontend(*this);
     closeFrontendConnection();
 }
 

diff --git a/Source/WebKit/WebProcess/WebPage/WebPageInspectorTarget.cpp b/Source/WebKit/WebProcess/WebPage/WebPageInspectorTarget.cpp
index a763484..f1bea50 100644 (file)
--- a/Source/WebKit/WebProcess/WebPage/WebPageInspectorTarget.cpp
+++ b/Source/WebKit/WebProcess/WebPage/WebPageInspectorTarget.cpp
@@ -47,13 +47,13 @@ String WebPageInspectorTarget::identifier() const
 void WebPageInspectorTarget::connect(Inspector::FrontendChannel& channel)
 {
     if (m_page.corePage())
-        m_page.corePage()->inspectorController().connectFrontend(&channel);
+        m_page.corePage()->inspectorController().connectFrontend(channel);
 }
 
 void WebPageInspectorTarget::disconnect(Inspector::FrontendChannel& channel)
 {
     if (m_page.corePage())
-        m_page.corePage()->inspectorController().disconnectFrontend(&channel);
+        m_page.corePage()->inspectorController().disconnectFrontend(channel);
 }
 
 void WebPageInspectorTarget::sendMessageToTargetBackend(const String& message)

diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
index 78aa0ef..4567883 100644 (file)
--- a/Source/WebKitLegacy/mac/ChangeLog
+++ b/Source/WebKitLegacy/mac/ChangeLog
@@ -1,5 +1,15 @@
 2018-11-14  Joseph Pecoraro  <pecoraro@apple.com>
 
+        Web Inspector: Pass Inspector::FrontendChannel as a reference connect/disconnect methods
+        https://bugs.webkit.org/show_bug.cgi?id=191612
+
+        Reviewed by Matt Baker.
+
+        * WebCoreSupport/WebInspectorClient.mm:
+        (-[WebInspectorWindowController destroyInspectorView]):
+
+2018-11-14  Joseph Pecoraro  <pecoraro@apple.com>
+
         Web Inspector: Keep Web Inspector window alive across process swaps (PSON) (Remote Inspector)
         https://bugs.webkit.org/show_bug.cgi?id=191494
         <rdar://problem/45469854>

diff --git a/Source/WebKitLegacy/mac/WebCoreSupport/WebInspectorClient.mm b/Source/WebKitLegacy/mac/WebCoreSupport/WebInspectorClient.mm
index 97a6961..4a5c3f8 100644 (file)
--- a/Source/WebKitLegacy/mac/WebCoreSupport/WebInspectorClient.mm
+++ b/Source/WebKitLegacy/mac/WebCoreSupport/WebInspectorClient.mm
@@ -655,7 +655,7 @@ void WebInspectorFrontendClient::append(const String& suggestedURL, const String
     if (Page* frontendPage = _frontendClient->frontendPage())
         frontendPage->inspectorController().setInspectorFrontendClient(nullptr);
     if (Page* inspectedPage = [_inspectedWebView.get() page])
-        inspectedPage->inspectorController().disconnectFrontend(_inspectorClient);
+        inspectedPage->inspectorController().disconnectFrontend(*_inspectorClient);
 
     [[_inspectedWebView.get() inspector] releaseFrontend];
     _inspectorClient->releaseFrontend();

diff --git a/Source/WebKitLegacy/win/ChangeLog b/Source/WebKitLegacy/win/ChangeLog
index 2b3e0af..138e634 100644 (file)
--- a/Source/WebKitLegacy/win/ChangeLog
+++ b/Source/WebKitLegacy/win/ChangeLog
@@ -1,3 +1,13 @@
+2018-11-14  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Pass Inspector::FrontendChannel as a reference connect/disconnect methods
+        https://bugs.webkit.org/show_bug.cgi?id=191612
+
+        Reviewed by Matt Baker.
+
+        * WebCoreSupport/WebInspectorClient.cpp:
+        (WebInspectorFrontendClient::destroyInspectorView):
+
 2018-11-12  Don Olmstead  <don.olmstead@sony.com>
 
         Shipped PNGs include bad profiles: iCCP: known incorrect sRGB profile

diff --git a/Source/WebKitLegacy/win/WebCoreSupport/WebInspectorClient.cpp b/Source/WebKitLegacy/win/WebCoreSupport/WebInspectorClient.cpp
index 08c683e..f8f0a46 100644 (file)
--- a/Source/WebKitLegacy/win/WebCoreSupport/WebInspectorClient.cpp
+++ b/Source/WebKitLegacy/win/WebCoreSupport/WebInspectorClient.cpp
@@ -422,7 +422,7 @@ void WebInspectorFrontendClient::destroyInspectorView()
     if (Page* frontendPage = this->frontendPage())
         frontendPage->inspectorController().setInspectorFrontendClient(nullptr);
     if (Page* inspectedPage = m_inspectedWebView->page())
-        inspectedPage->inspectorController().disconnectFrontend(m_inspectorClient);
+        inspectedPage->inspectorController().disconnectFrontend(*m_inspectorClient);
 
     m_inspectorClient->releaseFrontend();