Oilpan: Fix compile after r200678.

BUG=439376
TBR=yurys@chromium.org, oilpan-reviews@chromium.org
NOTRY=true

Review URL: https://codereview.chromium.org/1298843002

git-svn-id: svn://svn.chromium.org/blink/trunk@200688 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/core/inspector/InspectorDebuggerAgent.cpp

@@ -38,7 +38,7 @@ namespace blink {
 
 InspectorDebuggerAgent::InspectorDebuggerAgent(InjectedScriptManager* injectedScriptManager, V8Debugger* debugger, int contextGroupId)
     : InspectorBaseAgent<InspectorDebuggerAgent, InspectorFrontend::Debugger>("Debugger")
-    , m_v8DebuggerAgent(adoptPtr(new V8DebuggerAgent(injectedScriptManager, debugger, this, contextGroupId)))
+    , m_v8DebuggerAgent(adoptPtrWillBeNoop(new V8DebuggerAgent(injectedScriptManager, debugger, this, contextGroupId)))
 {
 }
 
@@ -49,6 +49,12 @@ InspectorDebuggerAgent::~InspectorDebuggerAgent()
 #endif
 }
 
+DEFINE_TRACE(InspectorDebuggerAgent)
+{
+    visitor->trace(m_v8DebuggerAgent);
+    InspectorBaseAgent<InspectorDebuggerAgent, InspectorFrontend::Debugger>::trace(visitor);
+}
+
 // Protocol implementation.
 void InspectorDebuggerAgent::enable(ErrorString* errorString)
 {

third_party/WebKit/Source/core/inspector/InspectorDebuggerAgent.h

@@ -42,6 +42,7 @@ class CORE_EXPORT InspectorDebuggerAgent
     , public V8DebuggerAgent::Client {
 public:
     ~InspectorDebuggerAgent() override;
+    DECLARE_VIRTUAL_TRACE();
 
     // InspectorBackendDispatcher::DebuggerCommandHandler implementation.
     void enable(ErrorString*) override;
@@ -108,7 +109,7 @@ public:
 protected:
     InspectorDebuggerAgent(InjectedScriptManager*, V8Debugger*, int contextGroupId);
 
-    OwnPtr<V8DebuggerAgent> m_v8DebuggerAgent;
+    OwnPtrWillBeMember<V8DebuggerAgent> m_v8DebuggerAgent;
 };
 
 } // namespace blink

third_party/WebKit/Source/core/inspector/V8DebuggerAgent.cpp

@@ -162,6 +162,18 @@ V8DebuggerAgent::~V8DebuggerAgent()
 {
 }
 
+DEFINE_TRACE(V8DebuggerAgent)
+{
+#if ENABLE(OILPAN)
+    visitor->trace(m_injectedScriptManager);
+    visitor->trace(m_asyncCallTrackingListeners);
+    visitor->trace(m_v8AsyncCallTracker);
+    visitor->trace(m_promiseTracker);
+    visitor->trace(m_asyncOperations);
+    visitor->trace(m_currentAsyncCallChain);
+#endif
+}
+
 bool V8DebuggerAgent::checkEnabled(ErrorString* errorString)
 {
     if (enabled())

third_party/WebKit/Source/core/inspector/V8DebuggerAgent.h

@@ -39,11 +39,13 @@ class V8Debugger;
 typedef String ErrorString;
 
 class CORE_EXPORT V8DebuggerAgent
-    : public V8DebuggerListener
+    : public NoBaseWillBeGarbageCollectedFinalized<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);
 public:
     enum BreakpointSource {
         UserBreakpointSource,
@@ -65,6 +67,7 @@ public:
 
     V8DebuggerAgent(InjectedScriptManager*, V8Debugger*, Client*, int contextGroupId);
     ~V8DebuggerAgent() override;
+    DECLARE_TRACE();
 
     void setInspectorState(InspectorState* state) { m_state = state; }
     void setFrontend(InspectorFrontend::Debugger* frontend) { m_frontend = frontend; }

third_party/WebKit/Source/core/inspector/WorkerDebuggerAgent.h

@@ -41,7 +41,6 @@ class WorkerThreadDebugger;
 class WorkerDebuggerAgent final : public InspectorDebuggerAgent {
     WTF_MAKE_NONCOPYABLE(WorkerDebuggerAgent);
     WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(WorkerDebuggerAgent);
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(WorkerDebuggerAgent);
 public:
     static PassOwnPtrWillBeRawPtr<WorkerDebuggerAgent> create(WorkerThreadDebugger*, WorkerGlobalScope*, InjectedScriptManager*);
     ~WorkerDebuggerAgent() override;