Inspector: wrapped inspector agent instances into factory-like wrappers

Source/core/inspector/InspectorController.cpp

Index: Source/core/inspector/InspectorController.cpp
diff --git a/Source/core/inspector/InspectorController.cpp b/Source/core/inspector/InspectorController.cpp
index 9e59ddca7a4060e057a60afe6b4d6a0d8a71de66..6a186734e87a7ecd64fa6d92e1443ff6f8e2fbea 100644
--- a/Source/core/inspector/InspectorController.cpp
+++ b/Source/core/inspector/InspectorController.cpp
@@ -84,62 +84,61 @@ InspectorController::InspectorController(Page* page, InspectorClient* inspectorC
     , m_inspectorClient(inspectorClient)
     , m_isUnderTest(false)
 {
-    m_agents.append(InspectorAgent::create(page, m_injectedScriptManager.get(), m_instrumentingAgents.get(), m_state.get()));
+    m_agentFactories.append(InspectorAgentFactory::create(page, m_injectedScriptManager.get(), m_instrumentingAgents.get(), m_state.get()));
 
-    OwnPtr<InspectorPageAgent> pageAgentPtr(InspectorPageAgent::create(m_instrumentingAgents.get(), page, m_state.get(), m_injectedScriptManager.get(), inspectorClient, m_overlay.get()));
-    InspectorPageAgent* pageAgent = pageAgentPtr.get();
-    m_agents.append(pageAgentPtr.release());
+    OwnPtr<InspectorPageFactory> pageFactoryPtr(InspectorPageFactory::create(m_instrumentingAgents.get(), m_state.get(), page, m_injectedScriptManager.get(), m_overlay.get(), inspectorClient));
+    InspectorPageFactory* pageFactory = pageFactoryPtr.get();
+    m_agentFactories.append(pageFactoryPtr.release());
 
-    OwnPtr<InspectorDOMAgent> domAgentPtr(InspectorDOMAgent::create(m_instrumentingAgents.get(), pageAgent, m_state.get(), m_injectedScriptManager.get(), m_overlay.get(), inspectorClient));
-    InspectorDOMAgent* domAgent = domAgentPtr.get();
-    m_agents.append(domAgentPtr.release());
+    OwnPtr<InspectorDOMFactory> domFactoryPtr(InspectorDOMFactory::create(m_instrumentingAgents.get(), m_state.get(), pageFactory, m_injectedScriptManager.get(), m_overlay.get(), inspectorClient));
+    InspectorDOMFactory* domFactory = domFactoryPtr.get();
+    m_agentFactories.append(domFactoryPtr.release());
 
-    m_agents.append(InspectorCSSAgent::create(m_instrumentingAgents.get(), m_state.get(), domAgent, pageAgent));
+    m_agentFactories.append(InspectorCSSFactory::create(m_instrumentingAgents.get(), m_state.get(), domFactory, pageFactory));
 
-    m_agents.append(InspectorDatabaseAgent::create(m_instrumentingAgents.get(), m_state.get()));
+    m_agentFactories.append(InspectorDatabaseFactory::create(m_instrumentingAgents.get(), m_state.get()));
 
-    m_agents.append(InspectorIndexedDBAgent::create(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptManager.get(), pageAgent));
+    m_agentFactories.append(InspectorIndexedDBFactory::create(m_instrumentingAgents.get(), m_state.get(), pageFactory, m_injectedScriptManager.get()));
 
-    m_agents.append(InspectorFileSystemAgent::create(m_instrumentingAgents.get(), pageAgent, m_state.get()));
+    m_agentFactories.append(InspectorFileSystemFactory::create(m_instrumentingAgents.get(), m_state.get(), pageFactory));
 
-    m_agents.append(InspectorDOMStorageAgent::create(m_instrumentingAgents.get(), pageAgent, m_state.get()));
+    m_agentFactories.append(InspectorDOMStorageFactory::create(m_instrumentingAgents.get(), m_state.get(), pageFactory));
 
-    OwnPtr<InspectorMemoryAgent> memoryAgentPtr(InspectorMemoryAgent::create(m_instrumentingAgents.get(), inspectorClient, m_state.get(), m_page));
-    m_memoryAgent = memoryAgentPtr.get();
-    m_agents.append(memoryAgentPtr.release());
+    OwnPtr<InspectorMemoryFactory> memoryFactoryPtr(InspectorMemoryFactory::create(m_instrumentingAgents.get(), inspectorClient, m_state.get(), m_page));
+    m_memoryFactory = memoryFactoryPtr.get();
+    m_agentFactories.append(memoryFactoryPtr.release());
 
-    m_agents.append(InspectorTimelineAgent::create(m_instrumentingAgents.get(), pageAgent, m_memoryAgent, domAgent, m_state.get(), InspectorTimelineAgent::PageInspector,
-       inspectorClient));
-    m_agents.append(InspectorApplicationCacheAgent::create(m_instrumentingAgents.get(), m_state.get(), pageAgent));
+    m_agentFactories.append(InspectorTimelineFactory::create(m_instrumentingAgents.get(), m_state.get(), pageFactory, m_memoryFactory, domFactory, InspectorTimelineAgent::PageInspector, inspectorClient));
+    m_agentFactories.append(InspectorApplicationCacheFactory::create(m_instrumentingAgents.get(), m_state.get(), pageFactory));
 
-    m_agents.append(InspectorResourceAgent::create(m_instrumentingAgents.get(), pageAgent, inspectorClient, m_state.get()));
+    m_agentFactories.append(InspectorResourceFactory::create(m_instrumentingAgents.get(), m_state.get(), pageFactory, inspectorClient));
 
     PageScriptDebugServer* pageScriptDebugServer = &PageScriptDebugServer::shared();
 
-    m_agents.append(PageRuntimeAgent::create(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptManager.get(), pageScriptDebugServer, page, pageAgent));
+    m_agentFactories.append(PageRuntimeFactory::create(m_instrumentingAgents.get(), m_state.get(), page, pageFactory, m_injectedScriptManager.get(), pageScriptDebugServer));
 
-    OwnPtr<InspectorConsoleAgent> consoleAgentPtr(PageConsoleAgent::create(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptManager.get(), domAgent));
-    InspectorConsoleAgent* consoleAgent = consoleAgentPtr.get();
-    m_agents.append(consoleAgentPtr.release());
+    OwnPtr<PageConsoleFactory> consoleFactoryPtr(PageConsoleFactory::create(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptManager.get(), domFactory));
+    InspectorConsoleFactory* consoleFactory = consoleFactoryPtr.get();
+    m_agentFactories.append(consoleFactoryPtr.release());
 
-    OwnPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgent::create(m_instrumentingAgents.get(), m_state.get(), pageScriptDebugServer, pageAgent, m_injectedScriptManager.get(), m_overlay.get()));
-    InspectorDebuggerAgent* debuggerAgent = debuggerAgentPtr.get();
-    m_agents.append(debuggerAgentPtr.release());
+    OwnPtr<PageDebuggerFactory> debuggerFactoryPtr(PageDebuggerFactory::create(m_instrumentingAgents.get(), m_state.get(), pageScriptDebugServer, pageFactory, m_injectedScriptManager.get(), m_overlay.get()));
+    PageDebuggerFactory* debuggerFactory = debuggerFactoryPtr.get();
+    m_agentFactories.append(debuggerFactoryPtr.release());
 
-    m_agents.append(InspectorDOMDebuggerAgent::create(m_instrumentingAgents.get(), m_state.get(), domAgent, debuggerAgent));
+    m_agentFactories.append(InspectorDOMDebuggerFactory::create(m_instrumentingAgents.get(), m_state.get(), domFactory, debuggerFactory));
 
-    m_agents.append(InspectorProfilerAgent::create(m_instrumentingAgents.get(), consoleAgent, m_state.get(), m_injectedScriptManager.get()));
+    m_agentFactories.append(InspectorProfilerFactory::create(m_instrumentingAgents.get(), m_state.get(), consoleFactory, m_injectedScriptManager.get()));
 
-    m_agents.append(InspectorHeapProfilerAgent::create(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptManager.get()));
+    m_agentFactories.append(InspectorHeapProfilerFactory::create(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptManager.get()));
 
 
-    m_agents.append(InspectorWorkerAgent::create(m_instrumentingAgents.get(), m_state.get()));
+    m_agentFactories.append(InspectorWorkerFactory::create(m_instrumentingAgents.get(), m_state.get()));
 
-    m_agents.append(InspectorCanvasAgent::create(m_instrumentingAgents.get(), m_state.get(), pageAgent, m_injectedScriptManager.get()));
+    m_agentFactories.append(InspectorCanvasFactory::create(m_instrumentingAgents.get(), m_state.get(), pageFactory, m_injectedScriptManager.get()));
 
-    m_agents.append(InspectorInputAgent::create(m_instrumentingAgents.get(), m_state.get(), page, inspectorClient));
+    m_agentFactories.append(InspectorInputFactory::create(m_instrumentingAgents.get(), m_state.get(), page, inspectorClient));
 
-    m_agents.append(InspectorLayerTreeAgent::create(m_instrumentingAgents.get(), m_state.get()));
+    m_agentFactories.append(InspectorLayerTreeFactory::create(m_instrumentingAgents.get(), m_state.get()));
 
     ASSERT_ARG(inspectorClient, inspectorClient);
     m_injectedScriptManager->injectedScriptHost()->init(m_instrumentingAgents.get(), pageScriptDebugServer);
@@ -148,7 +147,7 @@ InspectorController::InspectorController(Page* page, InspectorClient* inspectorC
 InspectorController::~InspectorController()
 {
     m_instrumentingAgents->reset();
-    m_agents.discardAgents();
+    m_agentFactories.discardDependencies();
     ASSERT(!m_inspectorClient);
 }
 
@@ -189,7 +188,7 @@ void InspectorController::connectFrontend(InspectorFrontendChannel* frontendChan
     // We can reconnect to existing front-end -> unmute state.
     m_state->unmute();
 
-    m_agents.setFrontend(m_inspectorFrontend.get());
+    m_agentFactories.setFrontend(m_inspectorFrontend.get());
 
     InspectorInstrumentation::registerInstrumentingAgents(m_instrumentingAgents.get());
     InspectorInstrumentation::frontendCreated();
@@ -197,7 +196,7 @@ void InspectorController::connectFrontend(InspectorFrontendChannel* frontendChan
     ASSERT(m_inspectorClient);
     m_inspectorBackendDispatcher = InspectorBackendDispatcher::create(frontendChannel);
 
-    m_agents.registerInDispatcher(m_inspectorBackendDispatcher.get());
+    m_agentFactories.registerInDispatcher(m_inspectorBackendDispatcher.get());
 }
 
 void InspectorController::disconnectFrontend()
@@ -211,7 +210,7 @@ void InspectorController::disconnectFrontend()
     // Pre-disconnect state will be used to restore inspector agents.
     m_state->mute();
 
-    m_agents.clearFrontend();
+    m_agentFactories.clearFrontend();
 
     m_inspectorFrontend.clear();
 
@@ -235,7 +234,7 @@ void InspectorController::reuseFrontend(InspectorFrontendChannel* frontendChanne
     ASSERT(!m_inspectorFrontend);
     connectFrontend(frontendChannel);
     m_state->loadFromCookie(inspectorStateCookie);
-    m_agents.restore();
+    m_agentFactories.restore();
 }
 
 void InspectorController::setProcessId(long processId)
@@ -371,7 +370,7 @@ void InspectorController::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo)
     info.addMember(m_inspectorFrontend, "inspectorFrontend");
     info.addMember(m_page, "page");
     info.addWeakPointer(m_inspectorClient);
-    info.addMember(m_agents, "agents");
+    info.addMember(m_agentFactories, "agents");
 }
 
 void InspectorController::willProcessTask()
@@ -421,7 +420,7 @@ void InspectorController::didComposite()
 HashMap<String, size_t> InspectorController::processMemoryDistribution() const
 {
     HashMap<String, size_t> memoryInfo;
-    m_memoryAgent->getProcessMemoryDistributionMap(&memoryInfo);
+    m_memoryFactory->agent()->getProcessMemoryDistributionMap(&memoryInfo);
     return memoryInfo;
 }