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

Unified Diff: Source/core/inspector/InspectorDOMDebuggerAgent.cpp

Issue 307943002: Oilpan: Prepare moving InspectorController and InspectorAgents to oilpan. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Separated out all non InspectorAgent and InspectorController classes Created 6 years, 6 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: Source/core/inspector/InspectorDOMDebuggerAgent.cpp
diff --git a/Source/core/inspector/InspectorDOMDebuggerAgent.cpp b/Source/core/inspector/InspectorDOMDebuggerAgent.cpp
index bedc03bd1118731b97098b3c9adefeb3f952cb9a..78e0c8ca718d9fefe5c504bea5d15a7e2ea49307 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)
@@ -90,8 +90,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.
@@ -150,7 +159,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)

Powered by Google App Engine
This is Rietveld 408576698