Index: Source/core/inspector/InspectorDebuggerAgent.h |
diff --git a/Source/core/inspector/InspectorDebuggerAgent.h b/Source/core/inspector/InspectorDebuggerAgent.h |
index fc2d5e972468035ec22e6a528db6d30438e91bc7..623fad281be86300beb63cb45786575a2906e6f2 100644 |
--- a/Source/core/inspector/InspectorDebuggerAgent.h |
+++ b/Source/core/inspector/InspectorDebuggerAgent.h |
@@ -74,7 +74,8 @@ class XMLHttpRequest; |
typedef String ErrorString; |
class InspectorDebuggerAgent : public InspectorBaseAgent<InspectorDebuggerAgent>, public ScriptDebugListener, public InspectorBackendDispatcher::DebuggerCommandHandler { |
- WTF_MAKE_NONCOPYABLE(InspectorDebuggerAgent); WTF_MAKE_FAST_ALLOCATED; |
+ WTF_MAKE_NONCOPYABLE(InspectorDebuggerAgent); |
+ WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED; |
public: |
enum BreakpointSource { |
UserBreakpointSource, |
@@ -85,6 +86,7 @@ public: |
static const char backtraceObjectGroup[]; |
virtual ~InspectorDebuggerAgent(); |
+ virtual void trace(Visitor*); |
virtual void canSetScriptSource(ErrorString*, bool* result) OVERRIDE FINAL { *result = true; } |
@@ -174,7 +176,7 @@ public: |
void breakProgram(InspectorFrontend::Debugger::Reason::Enum breakReason, PassRefPtr<JSONObject> data); |
void scriptExecutionBlockedByCSP(const String& directiveText); |
- class Listener { |
+ class Listener : public WillBeGarbageCollectedMixin { |
public: |
virtual ~Listener() { } |
virtual void debuggerWasEnabled() = 0; |
@@ -240,6 +242,7 @@ private: |
typedef HashMap<String, Vector<String> > BreakpointIdToDebugServerBreakpointIdsMap; |
typedef HashMap<String, std::pair<String, BreakpointSource> > DebugServerBreakpointToBreakpointIdAndSourceMap; |
+ // FIXME: Oilpan: Move InjectedScriptManager to heap in follow-up CL. |
InjectedScriptManager* m_injectedScriptManager; |
InspectorFrontend::Debugger* m_frontend; |
RefPtr<ScriptState> m_pausedScriptState; |
@@ -254,7 +257,7 @@ private: |
bool m_debuggerStepScheduled; |
bool m_steppingFromFramework; |
bool m_pausingOnNativeEvent; |
- Listener* m_listener; |
+ RawPtrWillBeMember<Listener> m_listener; |
int m_skippedStepInCount; |
int m_minFrameCountForSkip; |