Inspector: wrapped inspector agent instances into factory-like wrappers

Source/core/inspector/InspectorBaseAgent.cpp

Index: Source/core/inspector/InspectorBaseAgent.cpp
diff --git a/Source/core/inspector/InspectorBaseAgent.cpp b/Source/core/inspector/InspectorBaseAgent.cpp
index c999790116ce5a8f59da9ebe2bc73b98565cf090..f9522d9c573c5280edcfbe7acc6baed2c368a124 100644
--- a/Source/core/inspector/InspectorBaseAgent.cpp
+++ b/Source/core/inspector/InspectorBaseAgent.cpp
@@ -37,64 +37,109 @@
 
 namespace WebCore {
 
-InspectorBaseAgentInterface::InspectorBaseAgentInterface(const String& name, InstrumentingAgents* instrumentingAgents, InspectorCompositeState* inspectorState)
+InspectorBaseAgent::InspectorBaseAgent(InstrumentingAgents* instrumentingAgents, InspectorState* state)
     : m_instrumentingAgents(instrumentingAgents)
-    , m_state(inspectorState->createAgentState(name))
-    , m_name(name)
+    , m_state(state)
 {
 }
 
-InspectorBaseAgentInterface::~InspectorBaseAgentInterface()
+InspectorBaseAgent::~InspectorBaseAgent()
 {
 }
 
-void InspectorBaseAgentInterface::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
+void InspectorBaseAgent::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
 {
     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Inspector);
-    info.addMember(m_name, "name");
     info.addWeakPointer(m_instrumentingAgents);
     info.addWeakPointer(m_state);
 }
 
-void InspectorAgentRegistry::append(PassOwnPtr<InspectorBaseAgentInterface> agent)
+InspectorBaseControllerInterface::InspectorBaseControllerInterface(const String& name, InstrumentingAgents* instrumentingAgents, InspectorCompositeState* compositeState)
+    : m_instrumentingAgents(instrumentingAgents)
+    , m_state(compositeState->createAgentState(name))
+    , m_frontend(0)
+{
+}
+
+InspectorBaseControllerInterface::~InspectorBaseControllerInterface()
+{
+}
+
+void InspectorBaseControllerInterface::setAgent(PassRefPtr<InspectorBaseAgent> agent)
+{
+    ASSERT(!m_agent);
+    ASSERT(!m_frontend);
+    m_agent = agent;
+}
+
+void InspectorBaseControllerInterface::setFrontend(InspectorFrontend* frontend)
+{
+    m_frontend = frontend;
+    m_agent->setFrontend(m_frontend);
+}
+
+void InspectorBaseControllerInterface::clearFrontend()
+{
+    m_agent->clearFrontend();
+    m_frontend = 0;
+}
+
+void InspectorBaseControllerInterface::restore()
+{
+    m_agent->restore();
+}
+
+void InspectorBaseControllerInterface::discardAgent()
+{
+    m_agent->discardAgent();
+}
+
+void InspectorBaseControllerInterface::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
+{
+    MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Inspector);
+    info.addMember(m_agent.get(), "agent");
+}
+
+
+void InspectorAgentRegistry::append(PassOwnPtr<InspectorBaseControllerInterface> agent)
 {
-    m_agents.append(agent);
+    m_controllers.append(agent);
 }
 
 void InspectorAgentRegistry::setFrontend(InspectorFrontend* frontend)
 {
-    for (size_t i = 0; i < m_agents.size(); i++)
-        m_agents[i]->setFrontend(frontend);
+    for (size_t i = 0; i < m_controllers.size(); i++)
+        m_controllers[i]->setFrontend(frontend);
 }
 
 void InspectorAgentRegistry::clearFrontend()
 {
-    for (size_t i = 0; i < m_agents.size(); i++)
-        m_agents[i]->clearFrontend();
+    for (size_t i = 0; i < m_controllers.size(); i++)
+        m_controllers[i]->clearFrontend();
 }
 
 void InspectorAgentRegistry::restore()
 {
-    for (size_t i = 0; i < m_agents.size(); i++)
-        m_agents[i]->restore();
+    for (size_t i = 0; i < m_controllers.size(); i++)
+        m_controllers[i]->restore();
 }
 
 void InspectorAgentRegistry::registerInDispatcher(InspectorBackendDispatcher* dispatcher)
 {
-    for (size_t i = 0; i < m_agents.size(); i++)
-        m_agents[i]->registerInDispatcher(dispatcher);
+    for (size_t i = 0; i < m_controllers.size(); i++)
+        m_controllers[i]->registerInDispatcher(dispatcher);
 }
 
 void InspectorAgentRegistry::discardAgents()
 {
-    for (size_t i = 0; i < m_agents.size(); i++)
-        m_agents[i]->discardAgent();
+    for (size_t i = 0; i < m_controllers.size(); i++)
+        m_controllers[i]->discardAgent();
 }
 
 void InspectorAgentRegistry::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
 {
     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Inspector);
-    info.addMember(&m_agents, "agents");
+    info.addMember(&m_controllers, "agent_controllers");
 }
 
 } // namespace WebCore