Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(133)

Unified Diff: third_party/WebKit/Source/core/inspector/v8/V8DebuggerAgentImpl.h

Issue 1367623006: DevTools: extract V8DebuggerAgent interface, move it under .../inspector/v8 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/inspector/v8/V8DebuggerAgentImpl.h
diff --git a/third_party/WebKit/Source/core/inspector/V8DebuggerAgent.h b/third_party/WebKit/Source/core/inspector/v8/V8DebuggerAgentImpl.h
similarity index 81%
rename from third_party/WebKit/Source/core/inspector/V8DebuggerAgent.h
rename to third_party/WebKit/Source/core/inspector/v8/V8DebuggerAgentImpl.h
index 6956e2d54d603ead09569fe0806116233b9aced3..14921119baa7ae697e1f40e6850406b5cf71eebc 100644
--- a/third_party/WebKit/Source/core/inspector/V8DebuggerAgent.h
+++ b/third_party/WebKit/Source/core/inspector/v8/V8DebuggerAgentImpl.h
@@ -2,8 +2,8 @@
// 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
+#ifndef V8DebuggerAgentImpl_h
+#define V8DebuggerAgentImpl_h
#include "bindings/core/v8/ScriptState.h"
#include "bindings/core/v8/ScriptValue.h"
@@ -12,6 +12,7 @@
#include "core/inspector/InspectorBaseAgent.h"
#include "core/inspector/PromiseTracker.h"
#include "core/inspector/v8/ScriptBreakpoint.h"
+#include "core/inspector/v8/V8DebuggerAgent.h"
#include "core/inspector/v8/V8DebuggerListener.h"
#include "wtf/Forward.h"
#include "wtf/HashMap.h"
@@ -38,44 +39,27 @@ class V8Debugger;
typedef String ErrorString;
-class CORE_EXPORT V8DebuggerAgent
- : public NoBaseWillBeGarbageCollectedFinalized<V8DebuggerAgent>
+class CORE_EXPORT V8DebuggerAgentImpl
+ : public NoBaseWillBeGarbageCollectedFinalized<V8DebuggerAgentImpl>
+ , public V8DebuggerAgent
, public V8DebuggerListener
, public InspectorBackendDispatcher::DebuggerCommandHandler
, public PromiseTracker::Listener {
- WTF_MAKE_NONCOPYABLE(V8DebuggerAgent);
- WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(V8DebuggerAgent);
- WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(V8DebuggerAgent);
+ WTF_MAKE_NONCOPYABLE(V8DebuggerAgentImpl);
+ WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(V8DebuggerAgentImpl);
+ WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(V8DebuggerAgentImpl);
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;
+ V8DebuggerAgentImpl(InjectedScriptManager*, V8Debugger*, V8DebuggerAgent::Client*, int contextGroupId);
+ ~V8DebuggerAgentImpl() override;
DECLARE_TRACE();
- void setInspectorState(InspectorState* state) { m_state = state; }
- void setFrontend(InspectorFrontend::Debugger* frontend) { m_frontend = frontend; }
- void clearFrontend();
- void restore();
+ void setInspectorState(InspectorState* state) override { m_state = state; }
+ void setFrontend(InspectorFrontend::Debugger* frontend) override { m_frontend = frontend; }
+ void clearFrontend() override;
+ void restore() override;
void disable(ErrorString*) final;
- bool isPaused();
+ bool isPaused() override;
// Part of the protocol.
void enable(ErrorString*) override;
@@ -126,44 +110,33 @@ public:
void setAsyncOperationBreakpoint(ErrorString*, int operationId) final;
void removeAsyncOperationBreakpoint(ErrorString*, int operationId) final;
- void schedulePauseOnNextStatement(InspectorFrontend::Debugger::Reason::Enum breakReason, PassRefPtr<JSONObject> data);
- void cancelPauseOnNextStatement();
- bool canBreakProgram();
- void breakProgram(InspectorFrontend::Debugger::Reason::Enum breakReason, PassRefPtr<JSONObject> data);
- void willExecuteScript(int scriptId);
- void didExecuteScript();
+ void schedulePauseOnNextStatement(InspectorFrontend::Debugger::Reason::Enum breakReason, PassRefPtr<JSONObject> data) override;
+ void cancelPauseOnNextStatement() override;
+ bool canBreakProgram() override;
+ void breakProgram(InspectorFrontend::Debugger::Reason::Enum breakReason, PassRefPtr<JSONObject> data) override;
+ void willExecuteScript(int scriptId) override;
+ void didExecuteScript() override;
- bool enabled();
- V8Debugger& debugger() { return *m_debugger; }
+ bool enabled() override;
+ V8Debugger& debugger() override { 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);
+ void setBreakpoint(const String& scriptId, int lineNumber, int columnNumber, BreakpointSource, const String& condition = String()) override;
+ void removeBreakpoint(const String& scriptId, int lineNumber, int columnNumber, BreakpointSource) override;
// 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*);
+ PassRefPtrWillBeRawPtr<ScriptAsyncCallStack> currentAsyncStackTraceForConsole() override;
+ int traceAsyncOperationStarting(const String& description) override;
+ void traceAsyncCallbackStarting(int operationId) override;
+ void traceAsyncCallbackCompleted() override;
+ void traceAsyncOperationCompleted(int operationId) override;
+ bool trackingAsyncCalls() const override { return m_maxAsyncCallStackDepth; }
// PromiseTracker::Listener
void didUpdatePromise(InspectorFrontend::Debugger::EventType::Enum, PassRefPtr<TypeBuilder::Debugger::PromiseDetails>) final;
- InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId);
- InjectedScriptManager* injectedScriptManager() { return m_injectedScriptManager; }
- void reset();
+ InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId) override;
+ InjectedScriptManager* injectedScriptManager() override { return m_injectedScriptManager; }
+ void reset() override;
private:
bool checkEnabled(ErrorString*);
@@ -223,7 +196,7 @@ private:
RawPtrWillBeMember<InjectedScriptManager> m_injectedScriptManager;
V8Debugger* m_debugger;
- Client* m_client;
+ V8DebuggerAgent::Client* m_client;
int m_contextGroupId;
InspectorState* m_state;
InspectorFrontend::Debugger* m_frontend;
@@ -250,7 +223,6 @@ private:
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.
OwnPtrWillBeMember<V8AsyncCallTracker> m_v8AsyncCallTracker;
OwnPtrWillBeMember<PromiseTracker> m_promiseTracker;
@@ -273,4 +245,4 @@ private:
} // namespace blink
-#endif // V8DebuggerAgent_h
+#endif // V8DebuggerAgentImpl_h

Powered by Google App Engine
This is Rietveld 408576698