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

Unified Diff: Source/web/WebDevToolsAgentImpl.cpp

Issue 1286343003: DevTools: make InspectorDebuggerAgent aggregate V8DebuggerAgent instead of inheriting (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Addressed dgozman's comments Created 5 years, 4 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
« no previous file with comments | « Source/core/inspector/WorkerInspectorController.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebDevToolsAgentImpl.cpp
diff --git a/Source/web/WebDevToolsAgentImpl.cpp b/Source/web/WebDevToolsAgentImpl.cpp
index dc914d678264ff8eca3a1d43efee0e2e45c3aa10..f53bd5aa9e30c43e6fa224509f56535180fd2339 100644
--- a/Source/web/WebDevToolsAgentImpl.cpp
+++ b/Source/web/WebDevToolsAgentImpl.cpp
@@ -462,9 +462,9 @@ void WebDevToolsAgentImpl::initializeDeferredAgents()
OwnPtrWillBeRawPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgent::create(MainThreadDebugger::instance(), m_pageAgent, injectedScriptManager, m_overlay));
InspectorDebuggerAgent* debuggerAgent = debuggerAgentPtr.get();
m_agents.append(debuggerAgentPtr.release());
- m_asyncCallTracker = adoptPtrWillBeNoop(new AsyncCallTracker(debuggerAgent, m_instrumentingAgents.get()));
+ m_asyncCallTracker = adoptPtrWillBeNoop(new AsyncCallTracker(debuggerAgent->v8DebuggerAgent(), m_instrumentingAgents.get()));
- m_agents.append(InspectorDOMDebuggerAgent::create(injectedScriptManager, m_domAgent, debuggerAgent));
+ m_agents.append(InspectorDOMDebuggerAgent::create(injectedScriptManager, m_domAgent, debuggerAgent->v8DebuggerAgent()));
m_agents.append(InspectorInputAgent::create(m_pageAgent));
@@ -474,12 +474,12 @@ void WebDevToolsAgentImpl::initializeDeferredAgents()
m_agents.append(InspectorHeapProfilerAgent::create(isolate, injectedScriptManager));
m_pageAgent->setDebuggerAgent(debuggerAgent);
- m_pageConsoleAgent->setDebuggerAgent(debuggerAgent);
+ m_pageConsoleAgent->setDebuggerAgent(debuggerAgent->v8DebuggerAgent());
MainThreadDebugger* mainThreadDebugger = MainThreadDebugger::instance();
m_injectedScriptManager->injectedScriptHost()->init(
m_pageConsoleAgent.get(),
- debuggerAgent,
+ debuggerAgent->v8DebuggerAgent(),
bind<PassRefPtr<TypeBuilder::Runtime::RemoteObject>, PassRefPtr<JSONObject>>(&InspectorInspectorAgent::inspect, m_inspectorAgent.get()),
mainThreadDebugger->debugger(),
adoptPtr(new PageInjectedScriptHostClient()));
« no previous file with comments | « Source/core/inspector/WorkerInspectorController.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698