DevTools: make InspectorDebuggerAgent aggregate V8DebuggerAgent instead of inheriting

Source/core/inspector/V8DebuggerAgent.h

 // 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.
 
 #ifndef V8DebuggerAgent_h
 #define V8DebuggerAgent_h
 
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/ScriptValue.h"
 #include "core/CoreExport.h"
@@ skipping 21 matching lines @@
 class JSONObject;
 class RemoteCallFrameId;
 class ScriptAsyncCallStack;
 class ScriptRegexp;
 class V8AsyncCallTracker;
 class V8Debugger;
 
 typedef String ErrorString;
 
 class CORE_EXPORT V8DebuggerAgent
-    : public InspectorBaseAgent<V8DebuggerAgent, InspectorFrontend::Debugger>
-    , public V8DebuggerListener
+    : public V8DebuggerListener
     , public InspectorBackendDispatcher::DebuggerCommandHandler
     , public PromiseTracker::Listener {
     WTF_MAKE_NONCOPYABLE(V8DebuggerAgent);
     WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(V8DebuggerAgent);
 public:
     enum BreakpointSource {
         UserBreakpointSource,
         DebugCommandBreakpointSource,
         MonitorCommandBreakpointSource
     };
 
     static const char backtraceObjectGroup[];
 
     class CORE_EXPORT Client {
     public:
         virtual ~Client() { }
         virtual void debuggerAgentEnabled() = 0;
         virtual void debuggerAgentDisabled() = 0;
         virtual void muteConsole() = 0;
         virtual void unmuteConsole() = 0;
         virtual InjectedScript defaultInjectedScript() = 0;
     };
 
     V8DebuggerAgent(InjectedScriptManager*, V8Debugger*, Client*, int contextGroupId);
     ~V8DebuggerAgent() override;
-    DECLARE_VIRTUAL_TRACE();
 
-    void restore() override;
+    void setInspectorState(InspectorState* state) { m_state = state; }
+    void setFrontend(InspectorFrontend::Debugger* frontend) { m_frontend = frontend; }
+    void clearFrontend();
+    void restore();
     void disable(ErrorString*) final;
 
     bool isPaused();
 
     // Part of the protocol.
     void enable(ErrorString*) override;
     void setBreakpointsActive(ErrorString*, bool active) final;
     void setSkipAllPauses(ErrorString*, bool skipped) final;
 
     void setBreakpointByUrl(ErrorString*, int lineNumber, const String* optionalURL, const String* optionalURLRegex, const int* optionalColumnNumber, const String* optionalCondition, TypeBuilder::Debugger::BreakpointId*, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::Location>>& locations) final;
@@ skipping 34 matching lines @@
     void skipStackFrames(ErrorString*, const String* pattern, const bool* skipContentScripts) final;
     void setAsyncCallStackDepth(ErrorString*, int depth) final;
     void enablePromiseTracker(ErrorString*, const bool* captureStacks) final;
     void disablePromiseTracker(ErrorString*) final;
     void getPromiseById(ErrorString*, int promiseId, const String* objectGroup, RefPtr<TypeBuilder::Runtime::RemoteObject>& promise) final;
     void flushAsyncOperationEvents(ErrorString*) final;
     void setAsyncOperationBreakpoint(ErrorString*, int operationId) final;
     void removeAsyncOperationBreakpoint(ErrorString*, int operationId) final;
 
     void schedulePauseOnNextStatement(InspectorFrontend::Debugger::Reason::Enum breakReason, PassRefPtr<JSONObject> data);
-    void didFireTimer();
-    void didHandleEvent();
+    void cancelPauseOnNextStatement();
     bool canBreakProgram();
     void breakProgram(InspectorFrontend::Debugger::Reason::Enum breakReason, PassRefPtr<JSONObject> data);
-    void scriptExecutionBlockedByCSP(const String& directiveText);
-    void willCallFunction(ExecutionContext*, const DevToolsFunctionInfo&);
+    void willCallFunction(int ScriptId);

[dgozman, 2015/08/15 01:05:56]

weird capitalization

[yurys, 2015/08/17 17:15:06]

Done.

     void didCallFunction();
-    void willEvaluateScript(const String& url, int lineNumber);
+    void willEvaluateScript();
     void didEvaluateScript();
     bool getEditedScript(const String& url, String* content);
 
     bool enabled();
     V8Debugger& debugger() { return *m_debugger; }
 
     void setBreakpoint(const String& scriptId, int lineNumber, int columnNumber, BreakpointSource, const String& condition = String());
     void removeBreakpoint(const String& scriptId, int lineNumber, int columnNumber, BreakpointSource);
 
     // Async call stacks implementation
@@ skipping 28 matching lines @@
     void enable();
     void disable();
 
     SkipPauseRequest didPause(v8::Local<v8::Context>, v8::Local<v8::Object> callFrames, v8::Local<v8::Value> exception, const Vector<String>& hitBreakpoints, bool isPromiseRejection) final;
     void didContinue() final;
 
     SkipPauseRequest shouldSkipExceptionPause();
     SkipPauseRequest shouldSkipStepPause();
 
     void schedulePauseOnNextStatementIfSteppingInto();
-    void cancelPauseOnNextStatement();
 
     PassRefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame>> currentCallFrames();
     PassRefPtr<TypeBuilder::Debugger::StackTrace> currentAsyncStackTrace();
     bool callStackForId(ErrorString*, const RemoteCallFrameId&, v8::Local<v8::Object>* callStack, bool* isAsync);
 
     void clearCurrentAsyncOperation();
     void resetAsyncCallTracker();
 
     void changeJavaScriptRecursionLevel(int step);
 
@@ skipping 31 matching lines @@
         NoStep = 0,
         StepInto,
         StepOver,
         StepOut
     };
 
     RawPtrWillBeMember<InjectedScriptManager> m_injectedScriptManager;
     V8Debugger* m_debugger;
     Client* m_client;
     int m_contextGroupId;
+    InspectorState* m_state;
+    InspectorFrontend::Debugger* m_frontend;
     v8::Isolate* m_isolate;
     RefPtr<ScriptState> m_pausedScriptState;
     v8::Global<v8::Object> m_currentCallStack;
     ScriptsMap m_scripts;
     BreakpointIdToDebuggerBreakpointIdsMap m_breakpointIdToDebuggerBreakpointIds;
     DebugServerBreakpointToBreakpointIdAndSourceMap m_serverBreakpoints;
     String m_continueToLocationBreakpointId;
     InspectorFrontend::Debugger::Reason::Enum m_breakReason;
     RefPtr<JSONObject> m_breakAuxData;
     DebuggerStep m_scheduledDebuggerStep;
@@ skipping 28 matching lines @@
     int m_currentAsyncOperationId;
     bool m_pendingTraceAsyncOperationCompleted;
     bool m_startingStepIntoAsync;
     V8GlobalValueMap<String, v8::Script, v8::kNotWeak> m_compiledScripts;
 };
 
 } // namespace blink
 
 
 #endif // V8DebuggerAgent_h