Stop recording CPU profiles when Profiler agent is disabled

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 139 matching lines @@
     doEnable();
 }
 
 void InspectorProfilerAgent::doEnable()
 {
     m_instrumentingAgents->setInspectorProfilerAgent(this);
 }
 
 void InspectorProfilerAgent::disable(ErrorString*)
 {
+    for (Vector<ProfileDescriptor>::const_reverse_iterator it = m_startedProfiles.rbegin(); it != m_startedProfiles.rend(); ++it)
+        m_keepAliveProfile = ScriptProfiler::stop(it->m_id);
+    m_startedProfiles.clear();
+    stop(0, 0);
+
     m_keepAliveProfile.clear();
     m_instrumentingAgents->setInspectorProfilerAgent(0);
     m_state->setBoolean(ProfilerAgentState::profilerEnabled, false);
 }
 
 bool InspectorProfilerAgent::enabled()
 {
     return m_state->getBoolean(ProfilerAgentState::profilerEnabled);
 }
 
 void InspectorProfilerAgent::setSamplingInterval(ErrorString* error, int interval)
 {
     if (m_recordingCPUProfile) {
         *error = "Cannot change sampling interval when profiling.";
         return;
     }
     m_state->setLong(ProfilerAgentState::samplingInterval, interval);
     ScriptProfiler::setSamplingInterval(interval);
 }
 
 void InspectorProfilerAgent::setFrontend(InspectorFrontend* frontend)
 {
     m_frontend = frontend->profiler();
 }
 
 void InspectorProfilerAgent::clearFrontend()
 {
     m_frontend = 0;
-    stop(0, 0);
-    m_injectedScriptManager->injectedScriptHost()->clearInspectedObjects();
     ErrorString error;
     disable(&error);
+    m_injectedScriptManager->injectedScriptHost()->clearInspectedObjects();
 }
 
 void InspectorProfilerAgent::restore()
 {
     if (m_state->getBoolean(ProfilerAgentState::profilerEnabled)) {
         doEnable();
         m_frontend->resetProfiles();
     }
     if (long interval = m_state->getLong(ProfilerAgentState::samplingInterval, 0))
         ScriptProfiler::setSamplingInterval(interval);
     if (m_state->getBoolean(ProfilerAgentState::userInitiatedProfiling))
         start();
 }
 
 void InspectorProfilerAgent::start(ErrorString* error)
 {
     if (m_recordingCPUProfile)
         return;
     if (!enabled()) {
-        ErrorString error;
-        enable(&error);
+        *error = "Profiler is not enabled";
+        return;
     }
     m_recordingCPUProfile = true;
     if (m_overlay)
         m_overlay->startedRecordingProfile();
     m_frontendInitiatedProfileId = String::number(m_nextProfileId++);
     ScriptProfiler::start(m_frontendInitiatedProfileId);
     m_state->setBoolean(ProfilerAgentState::userInitiatedProfiling, true);
 }
 
 void InspectorProfilerAgent::stop(ErrorString* errorString, RefPtr<TypeBuilder::Profiler::CPUProfile>& profile)
@@ skipping 61 matching lines @@
     idleStarted();
 }
 
 void InspectorProfilerAgent::didLeaveNestedRunLoop()
 {
     idleFinished();
 }
 
 } // namespace WebCore