DevTools: make InspectorDebuggerAgent aggregate V8DebuggerAgent instead of inheriting

Source/core/inspector/V8DebuggerAgent.h

Index: Source/core/inspector/V8DebuggerAgent.h
diff --git a/Source/core/inspector/V8DebuggerAgent.h b/Source/core/inspector/V8DebuggerAgent.h
index 1cd7fd2d52b964bb904c165f6d427738dc81e15a..466407f03b8b03344f1b3a3bd934b7df67c10984 100644
--- a/Source/core/inspector/V8DebuggerAgent.h
+++ b/Source/core/inspector/V8DebuggerAgent.h
@@ -39,8 +39,7 @@ 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);
@@ -66,9 +65,11 @@ public:
 
     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();
@@ -123,14 +124,12 @@ public:
     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);
 
@@ -179,7 +178,6 @@ private:
     SkipPauseRequest shouldSkipStepPause();
 
     void schedulePauseOnNextStatementIfSteppingInto();
-    void cancelPauseOnNextStatement();
 
     PassRefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame>> currentCallFrames();
     PassRefPtr<TypeBuilder::Debugger::StackTrace> currentAsyncStackTrace();
@@ -231,6 +229,8 @@ private:
     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;