DevTools: make InspectorDebuggerAgent aggregate V8DebuggerAgent instead of inheriting

Source/core/inspector/InspectorDebuggerAgent.h

Index: Source/core/inspector/InspectorDebuggerAgent.h
diff --git a/Source/core/inspector/InspectorDebuggerAgent.h b/Source/core/inspector/InspectorDebuggerAgent.h
index bb19abed13c903ed8e9ce6aab8583795a7703b66..16f5d5e77cb640cd10521f8647a9272bd29beaeb 100644
--- a/Source/core/inspector/InspectorDebuggerAgent.h
+++ b/Source/core/inspector/InspectorDebuggerAgent.h
@@ -31,24 +31,86 @@
 #define InspectorDebuggerAgent_h
 
 #include "core/CoreExport.h"
+#include "core/inspector/InspectorBaseAgent.h"
 #include "core/inspector/V8DebuggerAgent.h"
 
 namespace blink {
 
 class CORE_EXPORT InspectorDebuggerAgent
-    : public V8DebuggerAgent
+    : public InspectorBaseAgent<InspectorDebuggerAgent, InspectorFrontend::Debugger>
+    , public InspectorBackendDispatcher::DebuggerCommandHandler
     , public V8DebuggerAgent::Client {
 public:
     ~InspectorDebuggerAgent() override;
 
+    // Protocol implementation

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

We usually write "InspectorBackendDispatcher::DebuggerCommandHandler
implementation".

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

Done.

     void enable(ErrorString*) override;
+    void disable(ErrorString*) override;
+    void setBreakpointsActive(ErrorString*, bool in_active) override;
+    void setSkipAllPauses(ErrorString*, bool in_skipped) override;
+    void setBreakpointByUrl(ErrorString*, int in_lineNumber, const String* in_url, const String* in_urlRegex, const int* in_columnNumber, const String* in_condition, TypeBuilder::Debugger::BreakpointId* out_breakpointId, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::Location>>& out_locations) override;
+    void setBreakpoint(ErrorString*, const RefPtr<JSONObject>& in_location, const String* in_condition, TypeBuilder::Debugger::BreakpointId* out_breakpointId, RefPtr<TypeBuilder::Debugger::Location>& out_actualLocation) override;
+    void removeBreakpoint(ErrorString*, const String& in_breakpointId) override;
+    void continueToLocation(ErrorString*, const RefPtr<JSONObject>& in_location, const bool* in_interstatementLocation) override;
+    void stepOver(ErrorString*) override;
+    void stepInto(ErrorString*) override;
+    void stepOut(ErrorString*) override;
+    void pause(ErrorString*) override;
+    void resume(ErrorString*) override;
+    void stepIntoAsync(ErrorString*) override;
+    void searchInContent(ErrorString*, const String& in_scriptId, const String& in_query, const bool* in_caseSensitive, const bool* in_isRegex, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::SearchMatch>>& out_result) override;
+    void canSetScriptSource(ErrorString*, bool* out_result) override;
+    void setScriptSource(ErrorString*, RefPtr<TypeBuilder::Debugger::SetScriptSourceError>& errorData, const String& in_scriptId, const String& in_scriptSource, const bool* in_preview, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame>>& opt_out_callFrames, TypeBuilder::OptOutput<bool>* opt_out_stackChanged, RefPtr<TypeBuilder::Debugger::StackTrace>& opt_out_asyncStackTrace) override;
+    void restartFrame(ErrorString*, const String& in_callFrameId, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame>>& out_callFrames, RefPtr<TypeBuilder::Debugger::StackTrace>& opt_out_asyncStackTrace) override;
+    void getScriptSource(ErrorString*, const String& in_scriptId, String* out_scriptSource) override;
+    void getFunctionDetails(ErrorString*, const String& in_functionId, RefPtr<TypeBuilder::Debugger::FunctionDetails>& out_details) override;
+    void getGeneratorObjectDetails(ErrorString*, const String& in_objectId, RefPtr<TypeBuilder::Debugger::GeneratorObjectDetails>& out_details) override;
+    void getCollectionEntries(ErrorString*, const String& in_objectId, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CollectionEntry>>& out_entries) override;
+    void setPauseOnExceptions(ErrorString*, const String& in_state) override;
+    void evaluateOnCallFrame(ErrorString*, const String& in_callFrameId, const String& in_expression, const String* in_objectGroup, const bool* in_includeCommandLineAPI, const bool* in_doNotPauseOnExceptionsAndMuteConsole, const bool* in_returnByValue, const bool* in_generatePreview, RefPtr<TypeBuilder::Runtime::RemoteObject>& out_result, TypeBuilder::OptOutput<bool>* opt_out_wasThrown, RefPtr<TypeBuilder::Debugger::ExceptionDetails>& opt_out_exceptionDetails) override;
+    void compileScript(ErrorString*, const String& in_expression, const String& in_sourceURL, bool in_persistScript, const int* in_executionContextId, TypeBuilder::OptOutput<TypeBuilder::Debugger::ScriptId>* opt_out_scriptId, RefPtr<TypeBuilder::Debugger::ExceptionDetails>& opt_out_exceptionDetails) override;
+    void runScript(ErrorString*, const String& in_scriptId, const int* in_executionContextId, const String* in_objectGroup, const bool* in_doNotPauseOnExceptionsAndMuteConsole, RefPtr<TypeBuilder::Runtime::RemoteObject>& out_result, RefPtr<TypeBuilder::Debugger::ExceptionDetails>& opt_out_exceptionDetails) override;
+    void setVariableValue(ErrorString*, int in_scopeNumber, const String& in_variableName, const RefPtr<JSONObject>& in_newValue, const String* in_callFrameId, const String* in_functionObjectId) override;
+    void getStepInPositions(ErrorString*, const String& in_callFrameId, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::Location>>& opt_out_stepInPositions) override;
+    void getBacktrace(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame>>& out_callFrames, RefPtr<TypeBuilder::Debugger::StackTrace>& opt_out_asyncStackTrace) override;
+    void skipStackFrames(ErrorString*, const String* in_script, const bool* in_skipContentScripts) override;
+    void setAsyncCallStackDepth(ErrorString*, int in_maxDepth) override;
+    void enablePromiseTracker(ErrorString*, const bool* in_captureStacks) override;
+    void disablePromiseTracker(ErrorString*) override;
+    void getPromiseById(ErrorString*, int in_promiseId, const String* in_objectGroup, RefPtr<TypeBuilder::Runtime::RemoteObject>& out_promise) override;
+    void flushAsyncOperationEvents(ErrorString*) override;
+    void setAsyncOperationBreakpoint(ErrorString*, int in_operationId) override;
+    void removeAsyncOperationBreakpoint(ErrorString*, int in_operationId) override;
 
     // V8DebuggerAgent::Client implementation.
     void debuggerAgentEnabled() override;
     void debuggerAgentDisabled() override;
 
+    // Called by InspectorInstrumentation.
+    bool isPaused();

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

I doubt that isPaused is called from instrumentation :)

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

But nevertheless it is:
https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit...

+    PassRefPtrWillBeRawPtr<ScriptAsyncCallStack> currentAsyncStackTraceForConsole();
+    void didFireTimer();
+    void didHandleEvent();
+    void scriptExecutionBlockedByCSP(const String& directiveText);
+    void willCallFunction(const DevToolsFunctionInfo&);
+    void didCallFunction();
+    void willEvaluateScript();
+    void didEvaluateScript();
+
+    bool getEditedScript(const String& url, String* content);
+
+    // InspectorBaseAgent overrides.
+    void init() override;
+    void setFrontend(InspectorFrontend*) override;
+    void clearFrontend() override;
+    void restore() override;
+
+    V8DebuggerAgent* v8DebuggerAgent() const { return m_debuggerAgent.get(); }
+
 protected:
     InspectorDebuggerAgent(InjectedScriptManager*, V8Debugger*, int contextGroupId);
+
+    OwnPtr<V8DebuggerAgent> m_debuggerAgent;
 };
 
 } // namespace blink