[DevTools] Move v8-related instrumentation from agents to InspectorSession.

third_party/WebKit/Source/platform/v8_inspector/V8ProfilerAgentImpl.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/v8_inspector/V8ProfilerAgentImpl.h"
 
 #include "platform/v8_inspector/Atomics.h"
 #include "platform/v8_inspector/V8DebuggerImpl.h"
 #include "platform/v8_inspector/V8InspectorSessionImpl.h"
 #include "platform/v8_inspector/V8StackTraceImpl.h"
@@ skipping 103 matching lines @@
 class V8ProfilerAgentImpl::ProfileDescriptor {
 public:
     ProfileDescriptor(const String16& id, const String16& title)
         : m_id(id)
         , m_title(title) { }
     String16 m_id;
     String16 m_title;
 };
 
 V8ProfilerAgentImpl::V8ProfilerAgentImpl(V8InspectorSessionImpl* session)
-    : m_debugger(session->debugger())
-    , m_isolate(m_debugger->isolate())
+    : m_session(session)
+    , m_isolate(m_session->debugger()->isolate())
     , m_state(nullptr)
     , m_frontend(nullptr)
     , m_enabled(false)
     , m_recordingCPUProfile(false)
 {
 }
 
 V8ProfilerAgentImpl::~V8ProfilerAgentImpl()
 {
 }
 
 void V8ProfilerAgentImpl::consoleProfile(const String16& title)
 {
-    ASSERT(m_frontend && m_enabled);
+    if (!m_enabled)
+        return;
+    ASSERT(m_frontend);
     String16 id = nextProfileId();
     m_startedProfiles.append(ProfileDescriptor(id, title));
     startProfiling(id);
-    m_frontend->consoleProfileStarted(id, currentDebugLocation(m_debugger), title);
+    m_frontend->consoleProfileStarted(id, currentDebugLocation(m_session->debugger()), title);
 }
 
 void V8ProfilerAgentImpl::consoleProfileEnd(const String16& title)
 {
-    ASSERT(m_frontend && m_enabled);
+    if (!m_enabled)
+        return;
+    ASSERT(m_frontend);
     String16 id;
     String16 resolvedTitle;
     // Take last started profile if no title was passed.
     if (title.isEmpty()) {
         if (m_startedProfiles.isEmpty())
             return;
         id = m_startedProfiles.last().m_id;
         resolvedTitle = m_startedProfiles.last().m_title;
         m_startedProfiles.removeLast();
     } else {
         for (size_t i = 0; i < m_startedProfiles.size(); i++) {
             if (m_startedProfiles[i].m_title == title) {
                 resolvedTitle = title;
                 id = m_startedProfiles[i].m_id;
                 m_startedProfiles.remove(i);
                 break;
             }
         }
         if (id.isEmpty())
             return;
     }
     OwnPtr<protocol::Profiler::CPUProfile> profile = stopProfiling(id, true);
     if (!profile)
         return;
-    OwnPtr<protocol::Debugger::Location> location = currentDebugLocation(m_debugger);
+    OwnPtr<protocol::Debugger::Location> location = currentDebugLocation(m_session->debugger());
     m_frontend->consoleProfileFinished(id, location.release(), profile.release(), resolvedTitle);
 }
 
 void V8ProfilerAgentImpl::enable(ErrorString*)
 {
+    if (m_enabled)
+        return;
     m_enabled = true;
+    m_session->changeInstrumentationCounter(+1);
 }
 
 void V8ProfilerAgentImpl::disable(ErrorString* errorString)
 {
+    if (!m_enabled)
+        return;
+    m_session->changeInstrumentationCounter(-1);
     for (size_t i = m_startedProfiles.size(); i > 0; --i)
         stopProfiling(m_startedProfiles[i - 1].m_id, false);
     m_startedProfiles.clear();
     stop(nullptr, nullptr);
     m_enabled = false;
 }
 
 void V8ProfilerAgentImpl::setSamplingInterval(ErrorString* error, int interval)
 {
     if (m_recordingCPUProfile) {
         *error = "Cannot change sampling interval when profiling.";
         return;
     }
     m_state->setNumber(ProfilerAgentState::samplingInterval, interval);
     m_isolate->GetCpuProfiler()->SetSamplingInterval(interval);
 }
 
 void V8ProfilerAgentImpl::clearFrontend()
 {
     ErrorString error;
     disable(&error);
     ASSERT(m_frontend);
     m_frontend = nullptr;
 }
 
 void V8ProfilerAgentImpl::restore()
 {
+    ASSERT(!m_enabled);
     m_enabled = true;
+    m_session->changeInstrumentationCounter(+1);
     int interval = 0;
     m_state->getNumber(ProfilerAgentState::samplingInterval, &interval);
     if (interval)
         m_isolate->GetCpuProfiler()->SetSamplingInterval(interval);
     if (m_state->booleanProperty(ProfilerAgentState::userInitiatedProfiling, false)) {
         ErrorString error;
         start(&error);
     }
 }
 
@@ skipping 66 matching lines @@
 }
 
 void V8ProfilerAgentImpl::idleStarted()
 {
     if (!isRecording())
         return;
     m_isolate->GetCpuProfiler()->SetIdle(true);
 }
 
 } // namespace blink