Changeset 244172 in webkit

Timestamp:

Apr 10, 2019, 5:33:29 PM (7 years ago)

Author:

Devin Rousso

Message:

Source/JavaScriptCore:

Web Inspector: Inspector: lazily create the agent
​https://bugs.webkit.org/show_bug.cgi?id=195971
<rdar://problem/49039645>

Reviewed by Joseph Pecoraro.

• inspector/JSGlobalObjectInspectorController.cpp: (Inspector::JSGlobalObjectInspectorController::JSGlobalObjectInspectorController): (Inspector::JSGlobalObjectInspectorController::connectFrontend): (Inspector::JSGlobalObjectInspectorController::appendExtraAgent): (Inspector::JSGlobalObjectInspectorController::createLazyAgents):

• inspector/agents/InspectorAgent.h:
• inspector/agents/InspectorAgent.cpp:

Source/WebCore:
Web Inspector: Inspector: lazily create the agent
​https://bugs.webkit.org/show_bug.cgi?id=195971
<rdar://problem/49039645>

Reviewed by Joseph Pecoraro.

No change in functionality.

• inspector/InspectorController.h:
• inspector/InspectorController.cpp:

(WebCore::InspectorController::InspectorController):
(WebCore::InspectorController::createLazyAgents):
(WebCore::InspectorController::evaluateForTestInFrontend):
(WebCore::InspectorController::ensureInspectorAgent):

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp (modified) (4 diffs)
• JavaScriptCore/inspector/agents/InspectorAgent.cpp (modified) (1 diff)
• JavaScriptCore/inspector/agents/InspectorAgent.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/inspector/InspectorController.cpp (modified) (4 diffs)
• WebCore/inspector/InspectorController.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-04-10  Devin Rousso  <drousso@apple.com>
+
+       Web Inspector: Inspector: lazily create the agent
+       https://bugs.webkit.org/show_bug.cgi?id=195971
+       <rdar://problem/49039645>
+
+       Reviewed by Joseph Pecoraro.
+
+       * inspector/JSGlobalObjectInspectorController.cpp:
+       (Inspector::JSGlobalObjectInspectorController::JSGlobalObjectInspectorController):
+       (Inspector::JSGlobalObjectInspectorController::connectFrontend):
+       (Inspector::JSGlobalObjectInspectorController::appendExtraAgent):
+       (Inspector::JSGlobalObjectInspectorController::createLazyAgents):
+
+       * inspector/agents/InspectorAgent.h:
+       * inspector/agents/InspectorAgent.cpp:
+
 2019-04-10  Saam Barati  <sbarati@apple.com>
 

trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp

@@ -72 +72 @@
     auto context = jsAgentContext();
 
-    auto inspectorAgent = std::make_unique<InspectorAgent>(context);
     auto consoleAgent = std::make_unique<InspectorConsoleAgent>(context);
-
-    m_inspectorAgent = inspectorAgent.get();
     m_consoleAgent = consoleAgent.get();
+    m_agents.append(WTFMove(consoleAgent));
+
     m_consoleClient = std::make_unique<JSGlobalObjectConsoleClient>(m_consoleAgent);
-
-    m_agents.append(WTFMove(inspectorAgent));
-    m_agents.append(WTFMove(consoleAgent));
 
     m_executionStopwatch->start();
@@ -123 +119 @@
 
 #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
+    ASSERT(m_inspectorAgent);
     m_inspectorAgent->activateExtraDomains(m_agents.extraDomains());
 
@@ -278 +275 @@
     m_agents.appendExtraAgent(WTFMove(agent));
 
+    ASSERT(m_inspectorAgent);
     m_inspectorAgent->activateExtraDomain(domainName);
 }
@@ -308 +306 @@
     auto context = jsAgentContext();
 
+    auto inspectorAgent = std::make_unique<InspectorAgent>(context);
+    m_inspectorAgent = inspectorAgent.get();
+    m_agents.append(WTFMove(inspectorAgent));
+
     m_agents.append(std::make_unique<JSGlobalObjectRuntimeAgent>(context));
 

trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp

@@ -43 +43 @@
     , m_frontendDispatcher(std::make_unique<InspectorFrontendDispatcher>(context.frontendRouter))
     , m_backendDispatcher(InspectorBackendDispatcher::create(context.backendDispatcher, this))
-{
-}
-
-InspectorAgent::~InspectorAgent()
 {
 }

trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.h

@@ -48 +48 @@
 public:
     InspectorAgent(AgentContext&);
-    virtual ~InspectorAgent();
+    virtual ~InspectorAgent() = default;
 
     void didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*) override;

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-04-10  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Inspector: lazily create the agent
+        https://bugs.webkit.org/show_bug.cgi?id=195971
+        <rdar://problem/49039645>
+
+        Reviewed by Joseph Pecoraro.
+
+        No change in functionality.
+
+        * inspector/InspectorController.h:
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::InspectorController):
+        (WebCore::InspectorController::createLazyAgents):
+        (WebCore::InspectorController::evaluateForTestInFrontend):
+        (WebCore::InspectorController::ensureInspectorAgent):
+
 2019-04-10  Megan Gardner  <megan_gardner@apple.com>
 

trunk/Source/WebCore/inspector/InspectorController.cpp

@@ -107 +107 @@
     auto pageContext = pageAgentContext();
 
-    auto inspectorAgentPtr = std::make_unique<InspectorAgent>(pageContext);
-    m_inspectorAgent = inspectorAgentPtr.get();
-    m_instrumentingAgents->setInspectorAgent(m_inspectorAgent);
-    m_agents.append(WTFMove(inspectorAgentPtr));
-
     auto consoleAgent = std::make_unique<PageConsoleAgent>(pageContext);
     m_instrumentingAgents->setWebConsoleAgent(consoleAgent.get());
@@ -158 +153 @@
     auto pageContext = pageAgentContext();
 
+    ensureInspectorAgent();
     ensurePageAgent();
 
@@ -360 +356 @@
 void InspectorController::evaluateForTestInFrontend(const String& script)
 {
-    m_inspectorAgent->evaluateForTestInFrontend(script);
+    ensureInspectorAgent().evaluateForTestInFrontend(script);
 }
 
@@ -421 +417 @@
 }
 
+InspectorAgent& InspectorController::ensureInspectorAgent()
+{
+    if (!m_inspectorAgent) {
+        auto pageContext = pageAgentContext();
+        auto inspectorAgent = std::make_unique<InspectorAgent>(pageContext);
+        m_inspectorAgent = inspectorAgent.get();
+        m_instrumentingAgents->setInspectorAgent(m_inspectorAgent);
+        m_agents.append(WTFMove(inspectorAgent));
+    }
+    return *m_inspectorAgent;
+}
+
 InspectorDOMAgent& InspectorController::ensureDOMAgent()
 {

trunk/Source/WebCore/inspector/InspectorController.h

@@ -107 +107 @@
     InspectorFrontendClient* inspectorFrontendClient() const { return m_inspectorFrontendClient; }
 
+    Inspector::InspectorAgent& ensureInspectorAgent();
     InspectorDOMAgent& ensureDOMAgent();
     WEBCORE_EXPORT InspectorPageAgent& ensurePageAgent();
@@ -139 +140 @@
     InspectorFrontendClient* m_inspectorFrontendClient { nullptr };
 
+    // Lazy, but also on-demand agents.
     Inspector::InspectorAgent* m_inspectorAgent { nullptr };
-
-    // Lazy, but also on-demand agents.
     InspectorDOMAgent* m_inspectorDOMAgent { nullptr };
     InspectorPageAgent* m_inspectorPageAgent { nullptr };