Inspector: wrapped inspector agent instances into factory-like wrappers

Source/core/inspector/InspectorProfilerAgent.cpp

 /*
  * Copyright (C) 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 46 matching lines @@
 
 namespace ProfilerAgentState {
 static const char userInitiatedProfiling[] = "userInitiatedProfiling";
 static const char profilerEnabled[] = "profilerEnabled";
 static const char profileHeadersRequested[] = "profileHeadersRequested";
 }
 
 static const char* const userInitiatedProfileName = "org.webkit.profiles.user-initiated";
 static const char* const CPUProfileType = "CPU";
 
-PassOwnPtr<InspectorProfilerAgent> InspectorProfilerAgent::create(InstrumentingAgents* instrumentingAgents, InspectorConsoleAgent* consoleAgent, InspectorCompositeState* inspectorState, InjectedScriptManager* injectedScriptManager)
+PassRefPtr<InspectorProfilerAgent> InspectorProfilerAgent::create(InstrumentingAgents* instrumentingAgents, InspectorState* inspectorState, PassRefPtr<InspectorConsoleAgent> consoleAgent, InjectedScriptManager* injectedScriptManager)
 {
-    return adoptPtr(new InspectorProfilerAgent(instrumentingAgents, consoleAgent, inspectorState, injectedScriptManager));
+    return adoptRef(new InspectorProfilerAgent(instrumentingAgents, inspectorState, consoleAgent, injectedScriptManager));
 }
 
-InspectorProfilerAgent::InspectorProfilerAgent(InstrumentingAgents* instrumentingAgents, InspectorConsoleAgent* consoleAgent, InspectorCompositeState* inspectorState, InjectedScriptManager* injectedScriptManager)
-    : InspectorBaseAgent<InspectorProfilerAgent>("Profiler", instrumentingAgents, inspectorState)
+InspectorProfilerAgent::InspectorProfilerAgent(InstrumentingAgents* instrumentingAgents, InspectorState* inspectorState, PassRefPtr<InspectorConsoleAgent> consoleAgent, InjectedScriptManager* injectedScriptManager)
+    : InspectorBaseAgent(instrumentingAgents, inspectorState)
     , m_consoleAgent(consoleAgent)
     , m_injectedScriptManager(injectedScriptManager)
     , m_frontend(0)
     , m_recordingCPUProfile(false)
     , m_currentUserInitiatedProfileNumber(-1)
     , m_nextUserInitiatedProfileNumber(1)
     , m_profileNameIdleTimeMap(ScriptProfiler::currentProfileNameIdleTimeMap())
     , m_previousTaskEndTime(0.0)
 {
 }
@@ skipping 185 matching lines @@
 
 void InspectorProfilerAgent::toggleRecordButton(bool isProfiling)
 {
     if (m_frontend)
         m_frontend->setRecordingProfile(isProfiling);
 }
 
 void InspectorProfilerAgent::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
 {
     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::InspectorProfilerAgent);
-    InspectorBaseAgent<InspectorProfilerAgent>::reportMemoryUsage(memoryObjectInfo);
+    InspectorBaseAgent::reportMemoryUsage(memoryObjectInfo);
     info.addMember(m_consoleAgent, "consoleAgent");
     info.addMember(m_injectedScriptManager, "injectedScriptManager");
     info.addWeakPointer(m_frontend);
     info.addMember(m_profiles, "profiles");
         info.addMember(m_profileNameIdleTimeMap, "profileNameIdleTimeMap");
 }
 
 void InspectorProfilerAgent::willProcessTask()
 {
     if (!m_profileNameIdleTimeMap || !m_profileNameIdleTimeMap->size())
         return;
     if (!m_previousTaskEndTime)
         return;
 
     double idleTime = WTF::monotonicallyIncreasingTime() - m_previousTaskEndTime;
     m_previousTaskEndTime = 0.0;
     ProfileNameIdleTimeMap::iterator end = m_profileNameIdleTimeMap->end();
     for (ProfileNameIdleTimeMap::iterator it = m_profileNameIdleTimeMap->begin(); it != end; ++it)
         it->value += idleTime;
 }
 
 void InspectorProfilerAgent::didProcessTask()
 {
     if (!m_profileNameIdleTimeMap || !m_profileNameIdleTimeMap->size())
         return;
     m_previousTaskEndTime = WTF::monotonicallyIncreasingTime();
 }
 
+InspectorProfilerController::InspectorProfilerController(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* compositeState, InspectorConsoleController* consoleController, InjectedScriptManager* injectedScriptManager)
+    : InspectorBaseController<InspectorProfilerController, InspectorProfilerAgent>("Profiler", instrumentingAgents, compositeState)
+{
+    setAgent(InspectorProfilerAgent::create(m_instrumentingAgents, m_state, consoleController->getAgent(), injectedScriptManager));
+}
+
 } // namespace WebCore