DevTools: make InspectorDebuggerAgent aggregate V8DebuggerAgent instead of inheriting

Source/core/inspector/AsyncCallTracker.cpp

 /*
  * Copyright (C) 2013 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 19 matching lines @@
 
 #include "config.h"
 #include "core/inspector/AsyncCallTracker.h"
 
 #include "core/dom/ContextLifecycleObserver.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/ExecutionContextTask.h"
 #include "core/events/Event.h"
 #include "core/events/EventTarget.h"
 #include "core/inspector/AsyncOperationMap.h"
-#include "core/inspector/InspectorDebuggerAgent.h"
+#include "core/inspector/V8DebuggerAgent.h"
 #include "core/xmlhttprequest/XMLHttpRequest.h"
 #include "core/xmlhttprequest/XMLHttpRequestUpload.h"
 #include "platform/ScriptForbiddenScope.h"
 #include "wtf/MainThread.h"
 #include "wtf/text/StringBuilder.h"
 #include "wtf/text/StringHash.h"
 
 namespace {
 
 static const char setTimeoutName[] = "setTimeout";
@@ skipping 79 matching lines @@
 static XMLHttpRequest* toXmlHttpRequest(EventTarget* eventTarget)
 {
     const AtomicString& interfaceName = eventTarget->interfaceName();
     if (interfaceName == EventTargetNames::XMLHttpRequest)
         return static_cast<XMLHttpRequest*>(eventTarget);
     if (interfaceName == EventTargetNames::XMLHttpRequestUpload)
         return static_cast<XMLHttpRequestUpload*>(eventTarget)->xmlHttpRequest();
     return nullptr;
 }
 
-AsyncCallTracker::AsyncCallTracker(InspectorDebuggerAgent* debuggerAgent, InstrumentingAgents* instrumentingAgents)
+AsyncCallTracker::AsyncCallTracker(V8DebuggerAgent* debuggerAgent, InstrumentingAgents* instrumentingAgents)
     : m_debuggerAgent(debuggerAgent)
     , m_instrumentingAgents(instrumentingAgents)
 {
     m_debuggerAgent->addAsyncCallTrackingListener(this);
 }
 
 AsyncCallTracker::~AsyncCallTracker()
 {
 #if !ENABLE(OILPAN)
     m_debuggerAgent->removeAsyncCallTrackingListener(this);
@@ skipping 40 matching lines @@
 bool AsyncCallTracker::willFireTimer(ExecutionContext* context, int timerId)
 {
     ASSERT(context);
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     ASSERT(timerId > 0);
     if (ExecutionContextData* data = m_executionContextDataMap.get(context)) {
         willFireAsyncCall(data->m_timerCallChains.get(timerId));
         if (!data->m_intervalTimerIds.contains(timerId))
             data->m_timerCallChains.remove(timerId);
     } else {
-        willFireAsyncCall(InspectorDebuggerAgent::unknownAsyncOperationId);
+        willFireAsyncCall(V8DebuggerAgent::unknownAsyncOperationId);
     }
     return true;
 }
 
 void AsyncCallTracker::didRequestAnimationFrame(ExecutionContext* context, int callbackId)
 {
     ASSERT(context);
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     int operationId = m_debuggerAgent->traceAsyncOperationStarting(requestAnimationFrameName);
     ASSERT(callbackId > 0);
@@ skipping 13 matching lines @@
 
 bool AsyncCallTracker::willFireAnimationFrame(ExecutionContext* context, int callbackId)
 {
     ASSERT(context);
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     ASSERT(callbackId > 0);
     if (ExecutionContextData* data = m_executionContextDataMap.get(context)) {
         willFireAsyncCall(data->m_animationFrameCallChains.get(callbackId));
         data->m_animationFrameCallChains.remove(callbackId);
     } else {
-        willFireAsyncCall(InspectorDebuggerAgent::unknownAsyncOperationId);
+        willFireAsyncCall(V8DebuggerAgent::unknownAsyncOperationId);
     }
     return true;
 }
 
 void AsyncCallTracker::didEnqueueEvent(EventTarget* eventTarget, Event* event)
 {
     ASSERT(eventTarget->executionContext());
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     OwnPtr<ScriptForbiddenScope::AllowUserAgentScript> allowScripting;
     if (isMainThread())
@@ skipping 15 matching lines @@
 {
     ASSERT(eventTarget->executionContext());
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     if (XMLHttpRequest* xhr = toXmlHttpRequest(eventTarget)) {
         willHandleXHREvent(xhr, event);
     } else {
         ExecutionContext* context = eventTarget->executionContext();
         if (ExecutionContextData* data = m_executionContextDataMap.get(context))
             willFireAsyncCall(data->m_eventCallChains.get(event));
         else
-            willFireAsyncCall(InspectorDebuggerAgent::unknownAsyncOperationId);
+            willFireAsyncCall(V8DebuggerAgent::unknownAsyncOperationId);
     }
 }
 
 void AsyncCallTracker::willLoadXHR(XMLHttpRequest* xhr, ThreadableLoaderClient*, const AtomicString&, const KURL&, bool async, PassRefPtr<FormData>, const HTTPHeaderMap&, bool)
 {
     ASSERT(xhr->executionContext());
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     if (!async)
         return;
     int operationId = m_debuggerAgent->traceAsyncOperationStarting(xhrSendName);
@@ skipping 10 matching lines @@
 }
 
 void AsyncCallTracker::willHandleXHREvent(XMLHttpRequest* xhr, Event* event)
 {
     ExecutionContext* context = xhr->executionContext();
     ASSERT(context);
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     if (ExecutionContextData* data = m_executionContextDataMap.get(context))
         willFireAsyncCall(data->m_xhrCallChains.get(xhr));
     else
-        willFireAsyncCall(InspectorDebuggerAgent::unknownAsyncOperationId);
+        willFireAsyncCall(V8DebuggerAgent::unknownAsyncOperationId);
 }
 
 void AsyncCallTracker::didEnqueueMutationRecord(ExecutionContext* context, MutationObserver* observer)
 {
     ASSERT(context);
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     ExecutionContextData* data = createContextDataIfNeeded(context);
     if (data->m_mutationObserverCallChains.contains(observer))
         return;
     int operationId = m_debuggerAgent->traceAsyncOperationStarting(enqueueMutationRecordName);
     data->m_mutationObserverCallChains.set(observer, operationId);
 }
 
 void AsyncCallTracker::didClearAllMutationRecords(ExecutionContext* context, MutationObserver* observer)
 {
     ASSERT(context);
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     if (ExecutionContextData* data = m_executionContextDataMap.get(context))
         data->m_mutationObserverCallChains.remove(observer);
 }
 
 void AsyncCallTracker::willDeliverMutationRecords(ExecutionContext* context, MutationObserver* observer)
 {
     ASSERT(context);
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     if (ExecutionContextData* data = m_executionContextDataMap.get(context)) {
         willFireAsyncCall(data->m_mutationObserverCallChains.get(observer));
         data->m_mutationObserverCallChains.remove(observer);
     } else {
-        willFireAsyncCall(InspectorDebuggerAgent::unknownAsyncOperationId);
+        willFireAsyncCall(V8DebuggerAgent::unknownAsyncOperationId);
     }
 }
 
 void AsyncCallTracker::didPostExecutionContextTask(ExecutionContext* context, ExecutionContextTask* task)
 {
     ASSERT(context);
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     if (task->taskNameForInstrumentation().isEmpty())
         return;
     int operationId = m_debuggerAgent->traceAsyncOperationStarting(task->taskNameForInstrumentation());
@@ skipping 10 matching lines @@
 }
 
 void AsyncCallTracker::willPerformExecutionContextTask(ExecutionContext* context, ExecutionContextTask* task)
 {
     ASSERT(context);
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     if (ExecutionContextData* data = m_executionContextDataMap.get(context)) {
         willFireAsyncCall(data->m_executionContextTaskCallChains.get(task));
         data->m_executionContextTaskCallChains.remove(task);
     } else {
-        willFireAsyncCall(InspectorDebuggerAgent::unknownAsyncOperationId);
+        willFireAsyncCall(V8DebuggerAgent::unknownAsyncOperationId);
     }
 }
 
 int AsyncCallTracker::traceAsyncOperationStarting(ExecutionContext* context, const String& operationName, int prevOperationId)
 {
     ASSERT(context);
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     if (prevOperationId)
         traceAsyncOperationCompleted(context, prevOperationId);
     int operationId = m_debuggerAgent->traceAsyncOperationStarting(operationName);
@@ skipping 25 matching lines @@
     if (ExecutionContextData* data = m_executionContextDataMap.get(context))
         return data->m_asyncOperations.contains(operationId);
     return false;
 }
 
 void AsyncCallTracker::traceAsyncCallbackStarting(ExecutionContext* context, int operationId)
 {
     ASSERT(context);
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     ASSERT(operationId <= 0 || isKnownAsyncOperationId(context, operationId));
-    willFireAsyncCall(operationId > 0 ? operationId : InspectorDebuggerAgent::unknownAsyncOperationId);
+    willFireAsyncCall(operationId > 0 ? operationId : V8DebuggerAgent::unknownAsyncOperationId);
 }
 
 void AsyncCallTracker::didFireAsyncCall()
 {
     m_debuggerAgent->traceAsyncCallbackCompleted();
 }
 
 void AsyncCallTracker::willFireAsyncCall(int operationId)
 {
     m_debuggerAgent->traceAsyncCallbackStarting(operationId);
 }
 
 AsyncCallTracker::ExecutionContextData* AsyncCallTracker::createContextDataIfNeeded(ExecutionContext* context)
 {
     ExecutionContextData* data = m_executionContextDataMap.get(context);
     if (!data) {
         data = m_executionContextDataMap.set(context, adoptPtrWillBeNoop(new AsyncCallTracker::ExecutionContextData(this, context)))
             .storedValue->value.get();
     }
     return data;
 }
 
 DEFINE_TRACE(AsyncCallTracker)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_executionContextDataMap);
     visitor->trace(m_debuggerAgent);
     visitor->trace(m_instrumentingAgents);
 #endif
-    InspectorDebuggerAgent::AsyncCallTrackingListener::trace(visitor);
+    V8DebuggerAgent::AsyncCallTrackingListener::trace(visitor);
 }
 
 } // namespace blink