Index: Source/core/inspector/InspectorDOMDebuggerAgent.cpp |
diff --git a/Source/core/inspector/InspectorDOMDebuggerAgent.cpp b/Source/core/inspector/InspectorDOMDebuggerAgent.cpp |
index 00289f5381d3c144406a4b8f8f1cb528b5be07b8..2d7709e7b0a6fb5e5d5fbc88ef7339dbac62ac85 100644 |
--- a/Source/core/inspector/InspectorDOMDebuggerAgent.cpp |
+++ b/Source/core/inspector/InspectorDOMDebuggerAgent.cpp |
@@ -74,9 +74,9 @@ static const char pauseOnAllXHRs[] = "pauseOnAllXHRs"; |
static const char xhrBreakpoints[] = "xhrBreakpoints"; |
} |
-PassOwnPtr<InspectorDOMDebuggerAgent> InspectorDOMDebuggerAgent::create(InspectorDOMAgent* domAgent, InspectorDebuggerAgent* debuggerAgent) |
+PassOwnPtrWillBeRawPtr<InspectorDOMDebuggerAgent> InspectorDOMDebuggerAgent::create(InspectorDOMAgent* domAgent, InspectorDebuggerAgent* debuggerAgent) |
{ |
- return adoptPtr(new InspectorDOMDebuggerAgent(domAgent, debuggerAgent)); |
+ return adoptPtrWillBeNoop(new InspectorDOMDebuggerAgent(domAgent, debuggerAgent)); |
} |
InspectorDOMDebuggerAgent::InspectorDOMDebuggerAgent(InspectorDOMAgent* domAgent, InspectorDebuggerAgent* debuggerAgent) |
@@ -91,8 +91,18 @@ InspectorDOMDebuggerAgent::InspectorDOMDebuggerAgent(InspectorDOMAgent* domAgent |
InspectorDOMDebuggerAgent::~InspectorDOMDebuggerAgent() |
{ |
+#if !ENABLE(OILPAN) |
ASSERT(!m_debuggerAgent); |
ASSERT(!m_instrumentingAgents->inspectorDOMDebuggerAgent()); |
+#endif |
+} |
+ |
+void InspectorDOMDebuggerAgent::trace(Visitor* visitor) |
+{ |
+ visitor->trace(m_domAgent); |
+ visitor->trace(m_debuggerAgent); |
+ visitor->trace(m_domBreakpoints); |
+ InspectorBaseAgent::trace(visitor); |
} |
// Browser debugger agent enabled only when JS debugger is enabled. |
@@ -151,7 +161,7 @@ void InspectorDOMDebuggerAgent::clearFrontend() |
void InspectorDOMDebuggerAgent::discardAgent() |
{ |
m_debuggerAgent->setListener(0); |
- m_debuggerAgent = 0; |
+ m_debuggerAgent = nullptr; |
} |
void InspectorDOMDebuggerAgent::setEventListenerBreakpoint(ErrorString* error, const String& eventName, const String* targetName) |