DevTools: make V8DebuggerAgent call Client instead of overriden methods

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 36 matching lines @@
     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 startListeningV8Debugger() = 0;
+        virtual void stopListeningV8Debugger() = 0;
+        virtual void muteConsole() = 0;
+        virtual void unmuteConsole() = 0;
+        virtual InjectedScript defaultInjectedScript() = 0;
+
+        virtual bool canPauseOnPromiseEvent() = 0;
+        virtual void didCreatePromise() = 0;
+        virtual void didResolvePromise() = 0;
+        virtual void didRejectPromise() = 0;
+    };
+
     ~V8DebuggerAgent() override;
     DECLARE_VIRTUAL_TRACE();
 
     void canSetScriptSource(ErrorString*, bool* result) final { *result = true; }
 
     void init() final;
     void restore() override;
     void disable(ErrorString*) final;
 
     bool isPaused();
@@ skipping 51 matching lines @@
     void didHandleEvent();
     bool canBreakProgram();
     void breakProgram(InspectorFrontend::Debugger::Reason::Enum breakReason, PassRefPtr<JSONObject> data);
     void scriptExecutionBlockedByCSP(const String& directiveText);
     void willCallFunction(ExecutionContext*, const DevToolsFunctionInfo&);
     void didCallFunction();
     void willEvaluateScript(const String& url, int lineNumber);
     void didEvaluateScript();
     bool getEditedScript(const String& url, String* content);
 
-    class CORE_EXPORT Listener : public WillBeGarbageCollectedMixin {
-    public:
-        virtual ~Listener() { }
-        virtual void debuggerWasEnabled() = 0;
-        virtual void debuggerWasDisabled() = 0;
-        virtual bool canPauseOnPromiseEvent() = 0;
-        virtual void didCreatePromise() = 0;
-        virtual void didResolvePromise() = 0;
-        virtual void didRejectPromise() = 0;
-    };
-    void setListener(Listener* listener) { m_listener = listener; }
-
     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
     PassRefPtrWillBeRawPtr<ScriptAsyncCallStack> currentAsyncStackTraceForConsole();
     static const int unknownAsyncOperationId;
     int traceAsyncOperationStarting(const String& description);
     void traceAsyncCallbackStarting(int operationId);
     void traceAsyncCallbackCompleted();
     void traceAsyncOperationCompleted(int operationId);
     bool trackingAsyncCalls() const { return m_maxAsyncCallStackDepth; }
 
     class CORE_EXPORT AsyncCallTrackingListener : public WillBeGarbageCollectedMixin {
     public:
         virtual ~AsyncCallTrackingListener() { }
         DEFINE_INLINE_VIRTUAL_TRACE() { }
         virtual void asyncCallTrackingStateChanged(bool tracking) = 0;
         virtual void resetAsyncOperations() = 0;
     };
     void addAsyncCallTrackingListener(AsyncCallTrackingListener*);
     void removeAsyncCallTrackingListener(AsyncCallTrackingListener*);
 
     // PromiseTracker::Listener
     void didUpdatePromise(InspectorFrontend::Debugger::EventType::Enum, PassRefPtr<TypeBuilder::Debugger::PromiseDetails>) final;
 
+    InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId);
+
 protected:
-    V8DebuggerAgent(InjectedScriptManager*, V8Debugger*);
+    V8DebuggerAgent(InjectedScriptManager*, V8Debugger*, Client*);
 
-    virtual void startListeningV8Debugger() = 0;
-    virtual void stopListeningV8Debugger() = 0;
-    virtual void muteConsole() = 0;
-    virtual void unmuteConsole() = 0;
     InjectedScriptManager* injectedScriptManager() { return m_injectedScriptManager; }
-    virtual InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId) = 0;
-
-    virtual void enable();
-    virtual void disable();
 
     void didContinue() final;
     void reset();
     void resetModifiedSources();
 
 private:
     bool checkEnabled(ErrorString*);
+    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;
 
     SkipPauseRequest shouldSkipExceptionPause();
     SkipPauseRequest shouldSkipStepPause();
 
     void schedulePauseOnNextStatementIfSteppingInto();
     void cancelPauseOnNextStatement();
 
     PassRefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame>> currentCallFrames();
@@ skipping 37 matching lines @@
 
     enum DebuggerStep {
         NoStep = 0,
         StepInto,
         StepOver,
         StepOut
     };
 
     RawPtrWillBeMember<InjectedScriptManager> m_injectedScriptManager;
     V8Debugger* m_debugger;
+    Client* m_client;
     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;
     bool m_skipNextDebuggerStepOut;
     bool m_javaScriptPauseScheduled;
     bool m_steppingFromFramework;
     bool m_pausingOnNativeEvent;
     bool m_pausingOnAsyncOperation;
-    RawPtrWillBeMember<Listener> m_listener;
 
     int m_skippedStepFrameCount;
     int m_recursionLevelForStepOut;
     int m_recursionLevelForStepFrame;
     bool m_skipAllPauses;
     bool m_skipContentScripts;
     OwnPtr<ScriptRegexp> m_cachedSkipStackRegExp;
     unsigned m_cachedSkipStackGeneration;
     WillBeHeapHashSet<RawPtrWillBeWeakMember<AsyncCallTrackingListener>> m_asyncCallTrackingListeners;
     // This field must be destroyed before the listeners set above.
@@ skipping 13 matching lines @@
     int m_currentAsyncOperationId;
     bool m_pendingTraceAsyncOperationCompleted;
     bool m_startingStepIntoAsync;
     V8GlobalValueMap<String, v8::Script, v8::kNotWeak> m_compiledScripts;
 };
 
 } // namespace blink
 
 
 #endif // V8DebuggerAgent_h