Changeset 246177 in webkit

Timestamp:

Jun 6, 2019 4:31:40 PM (5 years ago)

Author:

Devin Rousso

Message:

Web Inspector: create CommandLineAPIHost lazily like the other agents
​https://bugs.webkit.org/show_bug.cgi?id=196047
<rdar://problem/49087835>

Reviewed by Timothy Hatcher.

Source/JavaScriptCore:

• inspector/InjectedScriptManager.h:
• inspector/InjectedScriptManager.cpp:

(Inspector::InjectedScriptManager::connect): Added.

Source/WebCore:

No change in functionality.

• inspector/InspectorController.cpp:

(WebCore::InspectorController::InspectorController):
(WebCore::InspectorController::createLazyAgents):

• inspector/WorkerInspectorController.cpp:

(WebCore::WorkerInspectorController::WorkerInspectorController):
(WebCore::WorkerInspectorController::createLazyAgents):

• inspector/WebInjectedScriptManager.h:
• inspector/WebInjectedScriptManager.cpp:

(WebCore::WebInjectedScriptManager::WebInjectedScriptManager):
(WebCore::WebInjectedScriptManager::connect): Added.
(WebCore::WebInjectedScriptManager::disconnect):
(WebCore::WebInjectedScriptManager::discardInjectedScripts):

• inspector/agents/InspectorDOMAgent.cpp:

(WebCore::InspectorDOMAgent::setInspectedNode):

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/inspector/InjectedScriptManager.cpp (modified) (1 diff)
• JavaScriptCore/inspector/InjectedScriptManager.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/inspector/InspectorController.cpp (modified) (3 diffs)
• WebCore/inspector/WebInjectedScriptManager.cpp (modified) (3 diffs)
• WebCore/inspector/WebInjectedScriptManager.h (modified) (1 diff)
• WebCore/inspector/WorkerInspectorController.cpp (modified) (3 diffs)
• WebCore/inspector/agents/InspectorDOMAgent.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-06-06  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: create CommandLineAPIHost lazily like the other agents
+        https://bugs.webkit.org/show_bug.cgi?id=196047
+        <rdar://problem/49087835>
+
+        Reviewed by Timothy Hatcher.
+
+        * inspector/InjectedScriptManager.h:
+        * inspector/InjectedScriptManager.cpp:
+        (Inspector::InjectedScriptManager::connect): Added.
+
 2019-06-06  Keith Miller  <keith_miller@apple.com>
 

trunk/Source/JavaScriptCore/inspector/InjectedScriptManager.cpp

@@ -58 +58 @@
 }
 
+void InjectedScriptManager::connect()
+{
+}
+
 void InjectedScriptManager::disconnect()
 {

trunk/Source/JavaScriptCore/inspector/InjectedScriptManager.h

@@ -50 +50 @@
     virtual ~InjectedScriptManager();
 
+    virtual void connect();
     virtual void disconnect();
     virtual void discardInjectedScripts();

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-06  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: create CommandLineAPIHost lazily like the other agents
+        https://bugs.webkit.org/show_bug.cgi?id=196047
+        <rdar://problem/49087835>
+
+        Reviewed by Timothy Hatcher.
+
+        No change in functionality.
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::InspectorController):
+        (WebCore::InspectorController::createLazyAgents):
+        * inspector/WorkerInspectorController.cpp:
+        (WebCore::WorkerInspectorController::WorkerInspectorController):
+        (WebCore::WorkerInspectorController::createLazyAgents):
+
+        * inspector/WebInjectedScriptManager.h:
+        * inspector/WebInjectedScriptManager.cpp:
+        (WebCore::WebInjectedScriptManager::WebInjectedScriptManager):
+        (WebCore::WebInjectedScriptManager::connect): Added.
+        (WebCore::WebInjectedScriptManager::disconnect):
+        (WebCore::WebInjectedScriptManager::discardInjectedScripts):
+
+        * inspector/agents/InspectorDOMAgent.cpp:
+        (WebCore::InspectorDOMAgent::setInspectedNode):
+
 2019-06-05  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

trunk/Source/WebCore/inspector/InspectorController.cpp

@@ -110 +110 @@
     m_instrumentingAgents->setWebConsoleAgent(consoleAgent.get());
     m_agents.append(WTFMove(consoleAgent));
-
-    ASSERT(m_injectedScriptManager->commandLineAPIHost());
-    if (auto* commandLineAPIHost = m_injectedScriptManager->commandLineAPIHost())
-        commandLineAPIHost->init(m_instrumentingAgents.copyRef());
 }
 
@@ -150 +146 @@
 
     m_didCreateLazyAgents = true;
+
+    m_injectedScriptManager->connect();
 
     auto pageContext = pageAgentContext();
@@ -187 +185 @@
     m_agents.append(std::make_unique<InspectorCanvasAgent>(pageContext));
     m_agents.append(std::make_unique<InspectorTimelineAgent>(pageContext));
+
+    if (auto& commandLineAPIHost = m_injectedScriptManager->commandLineAPIHost())
+        commandLineAPIHost->init(m_instrumentingAgents.copyRef());
 }
 

trunk/Source/WebCore/inspector/WebInjectedScriptManager.cpp

@@ -37 +37 @@
 WebInjectedScriptManager::WebInjectedScriptManager(InspectorEnvironment& environment, Ref<InjectedScriptHost>&& host)
     : InjectedScriptManager(environment, WTFMove(host))
-    , m_commandLineAPIHost(CommandLineAPIHost::create())
 {
+}
+
+void WebInjectedScriptManager::connect()
+{
+    InjectedScriptManager::connect();
+
+    m_commandLineAPIHost = CommandLineAPIHost::create();
 }
 
@@ -45 +51 @@
     InjectedScriptManager::disconnect();
 
-    m_commandLineAPIHost->disconnect();
-    m_commandLineAPIHost = nullptr;
+    if (m_commandLineAPIHost) {
+        m_commandLineAPIHost->disconnect();
+        m_commandLineAPIHost = nullptr;
+    }
 }
 
@@ -53 +61 @@
     InjectedScriptManager::discardInjectedScripts();
 
-    m_commandLineAPIHost->clearAllWrappers();
+    if (m_commandLineAPIHost)
+        m_commandLineAPIHost->clearAllWrappers();
 }
 

trunk/Source/WebCore/inspector/WebInjectedScriptManager.h

@@ -41 +41 @@
     virtual ~WebInjectedScriptManager() = default;
 
-    CommandLineAPIHost* commandLineAPIHost() const { return m_commandLineAPIHost.get(); }
+    const RefPtr<CommandLineAPIHost>& commandLineAPIHost() const { return m_commandLineAPIHost; }
 
+    void connect() override;
     void disconnect() override;
     void discardInjectedScripts() override;

trunk/Source/WebCore/inspector/WorkerInspectorController.cpp

@@ -73 +73 @@
     m_instrumentingAgents->setWebConsoleAgent(consoleAgent.get());
     m_agents.append(WTFMove(consoleAgent));
-
-    if (auto* commandLineAPIHost = m_injectedScriptManager->commandLineAPIHost())
-        commandLineAPIHost->init(m_instrumentingAgents.copyRef());
 }
 
@@ -164 +161 @@
     m_didCreateLazyAgents = true;
 
+    m_injectedScriptManager->connect();
+
     auto workerContext = workerAgentContext();
 
@@ -178 +177 @@
     m_agents.append(std::make_unique<WorkerDebuggerAgent>(workerContext));
     m_agents.append(std::make_unique<WorkerAuditAgent>(workerContext));
+
+    if (auto& commandLineAPIHost = m_injectedScriptManager->commandLineAPIHost())
+        commandLineAPIHost->init(m_instrumentingAgents.copyRef());
 }
 

trunk/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp

@@ -1410 +1410 @@
     m_inspectedNode = node;
 
-    if (CommandLineAPIHost* commandLineAPIHost = static_cast<WebInjectedScriptManager&>(m_injectedScriptManager).commandLineAPIHost())
+    if (auto& commandLineAPIHost = static_cast<WebInjectedScriptManager&>(m_injectedScriptManager).commandLineAPIHost())
         commandLineAPIHost->addInspectedObject(std::make_unique<InspectableNode>(node));