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..2e4e301b1924ccdad929b99ab80adb97e9f23d0f 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_agents.append(InspectorAgentController::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<InspectorPageController> pageControllerPtr(InspectorPageController::create(m_instrumentingAgents.get(), m_state.get(), page, m_injectedScriptManager.get(), m_overlay.get(), inspectorClient));
+    InspectorPageController* pageController = pageControllerPtr.get();
+    m_agents.append(pageControllerPtr.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<InspectorDOMController> domControllerPtr(InspectorDOMController::create(m_instrumentingAgents.get(), m_state.get(), pageController, m_injectedScriptManager.get(), m_overlay.get(), inspectorClient));
+    InspectorDOMController* domController = domControllerPtr.get();
+    m_agents.append(domControllerPtr.release());
 
-    m_agents.append(InspectorCSSAgent::create(m_instrumentingAgents.get(), m_state.get(), domAgent, pageAgent));
+    m_agents.append(InspectorCSSController::create(m_instrumentingAgents.get(), m_state.get(), domController, pageController));

[pfeldman, 2013/06/18 15:36:06]

m_agent_factories?

[Vladislav Kaznacheev, 2013/06/19 12:58:43]

Done.

 
-    m_agents.append(InspectorDatabaseAgent::create(m_instrumentingAgents.get(), m_state.get()));
+    m_agents.append(InspectorDatabaseController::create(m_instrumentingAgents.get(), m_state.get()));
 
-    m_agents.append(InspectorIndexedDBAgent::create(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptManager.get(), pageAgent));
+    m_agents.append(InspectorIndexedDBController::create(m_instrumentingAgents.get(), m_state.get(), pageController, m_injectedScriptManager.get()));
 
-    m_agents.append(InspectorFileSystemAgent::create(m_instrumentingAgents.get(), pageAgent, m_state.get()));
+    m_agents.append(InspectorFileSystemController::create(m_instrumentingAgents.get(), m_state.get(), pageController));
 
-    m_agents.append(InspectorDOMStorageAgent::create(m_instrumentingAgents.get(), pageAgent, m_state.get()));
+    m_agents.append(InspectorDOMStorageController::create(m_instrumentingAgents.get(), m_state.get(), pageController));
 
-    OwnPtr<InspectorMemoryAgent> memoryAgentPtr(InspectorMemoryAgent::create(m_instrumentingAgents.get(), inspectorClient, m_state.get(), m_page));
-    m_memoryAgent = memoryAgentPtr.get();
-    m_agents.append(memoryAgentPtr.release());
+    OwnPtr<InspectorMemoryController> memoryControllerPtr(InspectorMemoryController::create(m_instrumentingAgents.get(), inspectorClient, m_state.get(), m_page));
+    m_memoryController = memoryControllerPtr.get();
+    m_agents.append(memoryControllerPtr.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_agents.append(InspectorTimelineController::create(m_instrumentingAgents.get(), m_state.get(), pageController, m_memoryController, domController, InspectorTimelineAgent::PageInspector, inspectorClient));
+    m_agents.append(InspectorApplicationCacheController::create(m_instrumentingAgents.get(), m_state.get(), pageController));
 
-    m_agents.append(InspectorResourceAgent::create(m_instrumentingAgents.get(), pageAgent, inspectorClient, m_state.get()));
+    m_agents.append(InspectorResourceController::create(m_instrumentingAgents.get(), m_state.get(), pageController, inspectorClient));
 
     PageScriptDebugServer* pageScriptDebugServer = &PageScriptDebugServer::shared();
 
-    m_agents.append(PageRuntimeAgent::create(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptManager.get(), pageScriptDebugServer, page, pageAgent));
+    m_agents.append(PageRuntimeController::create(m_instrumentingAgents.get(), m_state.get(), page, pageController, 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<PageConsoleController> consoleControllerPtr(PageConsoleController::create(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptManager.get(), domController));
+    InspectorConsoleController* consoleController = consoleControllerPtr.get();
+    m_agents.append(consoleControllerPtr.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<PageDebuggerController> debuggerControllerPtr(PageDebuggerController::create(m_instrumentingAgents.get(), m_state.get(), pageScriptDebugServer, pageController, m_injectedScriptManager.get(), m_overlay.get()));
+    PageDebuggerController* debuggerController = debuggerControllerPtr.get();
+    m_agents.append(debuggerControllerPtr.release());
 
-    m_agents.append(InspectorDOMDebuggerAgent::create(m_instrumentingAgents.get(), m_state.get(), domAgent, debuggerAgent));
+    m_agents.append(InspectorDOMDebuggerController::create(m_instrumentingAgents.get(), m_state.get(), domController, debuggerController));
 
-    m_agents.append(InspectorProfilerAgent::create(m_instrumentingAgents.get(), consoleAgent, m_state.get(), m_injectedScriptManager.get()));
+    m_agents.append(InspectorProfilerController::create(m_instrumentingAgents.get(), m_state.get(), consoleController, m_injectedScriptManager.get()));
 
-    m_agents.append(InspectorHeapProfilerAgent::create(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptManager.get()));
+    m_agents.append(InspectorHeapProfilerController::create(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptManager.get()));
 
 
-    m_agents.append(InspectorWorkerAgent::create(m_instrumentingAgents.get(), m_state.get()));
+    m_agents.append(InspectorWorkerController::create(m_instrumentingAgents.get(), m_state.get()));
 
-    m_agents.append(InspectorCanvasAgent::create(m_instrumentingAgents.get(), m_state.get(), pageAgent, m_injectedScriptManager.get()));
+    m_agents.append(InspectorCanvasController::create(m_instrumentingAgents.get(), m_state.get(), pageController, m_injectedScriptManager.get()));
 
-    m_agents.append(InspectorInputAgent::create(m_instrumentingAgents.get(), m_state.get(), page, inspectorClient));
+    m_agents.append(InspectorInputController::create(m_instrumentingAgents.get(), m_state.get(), page, inspectorClient));
 
-    m_agents.append(InspectorLayerTreeAgent::create(m_instrumentingAgents.get(), m_state.get()));
+    m_agents.append(InspectorLayerTreeController::create(m_instrumentingAgents.get(), m_state.get()));
 
     ASSERT_ARG(inspectorClient, inspectorClient);
     m_injectedScriptManager->injectedScriptHost()->init(m_instrumentingAgents.get(), pageScriptDebugServer);
@@ -421,7 +420,7 @@ void InspectorController::didComposite()
 HashMap<String, size_t> InspectorController::processMemoryDistribution() const
 {
     HashMap<String, size_t> memoryInfo;
-    m_memoryAgent->getProcessMemoryDistributionMap(&memoryInfo);
+    m_memoryController->getAgent()->getProcessMemoryDistributionMap(&memoryInfo);
     return memoryInfo;
 }