Inspector: wrapped inspector agent instances into factory-like wrappers

Source/core/inspector/WorkerInspectorController.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 77 matching lines @@
 }
 
 WorkerInspectorController::WorkerInspectorController(WorkerContext* workerContext)
     : m_workerContext(workerContext)
     , m_stateClient(adoptPtr(new WorkerStateClient(workerContext)))
     , m_state(adoptPtr(new InspectorCompositeState(m_stateClient.get())))
     , m_instrumentingAgents(InstrumentingAgents::create())
     , m_injectedScriptManager(InjectedScriptManager::createForWorker())
     , m_debugServer(adoptPtr(new WorkerScriptDebugServer(workerContext, WorkerDebuggerAgent::debuggerTaskMode)))
 {
-    m_agents.append(WorkerRuntimeAgent::create(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptManager.get(), m_debugServer.get(), workerContext));
+    m_agentFactories.append(WorkerRuntimeFactory::create(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptManager.get(), m_debugServer.get(), workerContext));
 
-    OwnPtr<InspectorConsoleAgent> consoleAgent = WorkerConsoleAgent::create(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptManager.get());
-    m_agents.append(WorkerDebuggerAgent::create(m_instrumentingAgents.get(), m_state.get(), m_debugServer.get(), workerContext, m_injectedScriptManager.get()));
+    OwnPtr<WorkerConsoleFactory> consoleFactory = WorkerConsoleFactory::create(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptManager.get());
+    m_agentFactories.append(WorkerDebuggerFactory::create(m_instrumentingAgents.get(), m_state.get(), m_debugServer.get(), workerContext, m_injectedScriptManager.get()));
 
-    m_agents.append(InspectorProfilerAgent::create(m_instrumentingAgents.get(), consoleAgent.get(), m_state.get(), m_injectedScriptManager.get()));
-    m_agents.append(InspectorHeapProfilerAgent::create(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptManager.get()));
-    m_agents.append(InspectorTimelineAgent::create(m_instrumentingAgents.get(), 0, 0, 0, m_state.get(), InspectorTimelineAgent::WorkerInspector, 0));
-    m_agents.append(consoleAgent.release());
+    m_agentFactories.append(InspectorProfilerFactory::create(m_instrumentingAgents.get(), m_state.get(), consoleFactory.get(), m_injectedScriptManager.get()));
+    m_agentFactories.append(InspectorHeapProfilerFactory::create(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptManager.get()));
+    m_agentFactories.append(InspectorTimelineFactory::create(m_instrumentingAgents.get(), m_state.get(), 0, 0, 0, InspectorTimelineAgent::WorkerInspector, 0));
+    m_agentFactories.append(consoleFactory.release());
 
     m_injectedScriptManager->injectedScriptHost()->init(m_instrumentingAgents.get(), m_debugServer.get());
 }
  
 WorkerInspectorController::~WorkerInspectorController()
 {
     m_instrumentingAgents->reset();
     disconnectFrontend();
 }
 
 void WorkerInspectorController::connectFrontend()
 {
     ASSERT(!m_frontend);
     m_state->unmute();
     m_frontendChannel = adoptPtr(new PageInspectorProxy(m_workerContext));
     m_frontend = adoptPtr(new InspectorFrontend(m_frontendChannel.get()));
     m_backendDispatcher = InspectorBackendDispatcher::create(m_frontendChannel.get());
-    m_agents.registerInDispatcher(m_backendDispatcher.get());
-    m_agents.setFrontend(m_frontend.get());
+    m_agentFactories.registerInDispatcher(m_backendDispatcher.get());
+    m_agentFactories.setFrontend(m_frontend.get());
 }
 
 void WorkerInspectorController::disconnectFrontend()
 {
     if (!m_frontend)
         return;
     m_backendDispatcher->clearFrontend();
     m_backendDispatcher.clear();
     // Destroying agents would change the state, but we don't want that.
     // Pre-disconnect state will be used to restore inspector agents.
     m_state->mute();
-    m_agents.clearFrontend();
+    m_agentFactories.clearFrontend();
     m_frontend.clear();
     m_frontendChannel.clear();
 }
 
 void WorkerInspectorController::restoreInspectorStateFromCookie(const String& inspectorCookie)
 {
     ASSERT(!m_frontend);
     connectFrontend();
     m_state->loadFromCookie(inspectorCookie);
 
-    m_agents.restore();
+    m_agentFactories.restore();
 }
 
 void WorkerInspectorController::dispatchMessageFromFrontend(const String& message)
 {
     if (m_backendDispatcher)
         m_backendDispatcher->dispatch(message);
 }
 
 void WorkerInspectorController::resume()
 {
     if (WorkerRuntimeAgent* runtimeAgent = m_instrumentingAgents->workerRuntimeAgent()) {
         ErrorString unused;
         runtimeAgent->run(&unused);
     }
 }
 
 }