| Index: Source/core/inspector/InspectorDOMDebuggerAgent.cpp
|
| diff --git a/Source/core/inspector/InspectorDOMDebuggerAgent.cpp b/Source/core/inspector/InspectorDOMDebuggerAgent.cpp
|
| index 60701d59dc35a67dd6f55be30c3e767c621f2028..d516f5071566fb112d11ece832f77f99bbb530a3 100644
|
| --- a/Source/core/inspector/InspectorDOMDebuggerAgent.cpp
|
| +++ b/Source/core/inspector/InspectorDOMDebuggerAgent.cpp
|
| @@ -73,9 +73,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)
|
| @@ -89,8 +89,17 @@ 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);
|
| + InspectorBaseAgent::trace(visitor);
|
| }
|
|
|
| // Browser debugger agent enabled only when JS debugger is enabled.
|
| @@ -137,7 +146,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)
|
|
|