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

Unified Diff: Source/web/WebDevToolsAgentImpl.cpp

Issue 1092123004: DevTools: remove dependency of most agents on InspectorPageAgent (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: further cuts on InspectorPageAgent inter-agents API Created 5 years, 8 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/web/WebDevToolsAgentImpl.cpp
diff --git a/Source/web/WebDevToolsAgentImpl.cpp b/Source/web/WebDevToolsAgentImpl.cpp
index 4c6c175900674603bc8cf02437847503a4c63d15..596789146178554fec171b4c3ae7dcc110abe273 100644
--- a/Source/web/WebDevToolsAgentImpl.cpp
+++ b/Source/web/WebDevToolsAgentImpl.cpp
@@ -300,20 +300,21 @@ WebDevToolsAgentImpl::WebDevToolsAgentImpl(
ASSERT(processId > 0);
IdentifiersFactory::setProcessId(processId);
InjectedScriptManager* injectedScriptManager = m_injectedScriptManager.get();
+ LocalFrame* inspectedFrame = m_webLocalFrameImpl->frame();
OwnPtrWillBeRawPtr<InspectorInspectorAgent> inspectorAgentPtr(InspectorInspectorAgent::create(injectedScriptManager));
m_inspectorAgent = inspectorAgentPtr.get();
m_agents.append(inspectorAgentPtr.release());
- OwnPtrWillBeRawPtr<InspectorPageAgent> pageAgentPtr(InspectorPageAgent::create(m_webLocalFrameImpl->frame(), m_overlay));
+ OwnPtrWillBeRawPtr<InspectorPageAgent> pageAgentPtr(InspectorPageAgent::create(inspectedFrame, m_overlay));
m_pageAgent = pageAgentPtr.get();
m_agents.append(pageAgentPtr.release());
- OwnPtrWillBeRawPtr<InspectorDOMAgent> domAgentPtr(InspectorDOMAgent::create(m_pageAgent, injectedScriptManager, m_overlay));
+ OwnPtrWillBeRawPtr<InspectorDOMAgent> domAgentPtr(InspectorDOMAgent::create(inspectedFrame, injectedScriptManager, m_overlay));
m_domAgent = domAgentPtr.get();
m_agents.append(domAgentPtr.release());
- OwnPtrWillBeRawPtr<InspectorLayerTreeAgent> layerTreeAgentPtr(InspectorLayerTreeAgent::create(m_pageAgent));
+ OwnPtrWillBeRawPtr<InspectorLayerTreeAgent> layerTreeAgentPtr(InspectorLayerTreeAgent::create(inspectedFrame));
m_layerTreeAgent = layerTreeAgentPtr.get();
m_agents.append(layerTreeAgentPtr.release());
@@ -322,16 +323,16 @@ WebDevToolsAgentImpl::WebDevToolsAgentImpl(
ClientMessageLoopAdapter::ensurePageScriptDebugServerCreated(m_client);
PageScriptDebugServer* scriptDebugServer = PageScriptDebugServer::instance();
- OwnPtrWillBeRawPtr<PageRuntimeAgent> pageRuntimeAgentPtr(PageRuntimeAgent::create(injectedScriptManager, this, scriptDebugServer, m_pageAgent));
+ OwnPtrWillBeRawPtr<PageRuntimeAgent> pageRuntimeAgentPtr(PageRuntimeAgent::create(inspectedFrame, injectedScriptManager, this, scriptDebugServer));
m_pageRuntimeAgent = pageRuntimeAgentPtr.get();
m_agents.append(pageRuntimeAgentPtr.release());
- OwnPtrWillBeRawPtr<PageConsoleAgent> pageConsoleAgentPtr = PageConsoleAgent::create(injectedScriptManager, m_domAgent, m_pageAgent);
+ OwnPtrWillBeRawPtr<PageConsoleAgent> pageConsoleAgentPtr = PageConsoleAgent::create(inspectedFrame, injectedScriptManager, m_domAgent);
m_pageConsoleAgent = pageConsoleAgentPtr.get();
OwnPtrWillBeRawPtr<InspectorWorkerAgent> workerAgentPtr = InspectorWorkerAgent::create(pageConsoleAgentPtr.get());
- OwnPtrWillBeRawPtr<InspectorTracingAgent> tracingAgentPtr = InspectorTracingAgent::create(this, workerAgentPtr.get(), m_pageAgent);
+ OwnPtrWillBeRawPtr<InspectorTracingAgent> tracingAgentPtr = InspectorTracingAgent::create(inspectedFrame, this, workerAgentPtr.get());
m_tracingAgent = tracingAgentPtr.get();
m_agents.append(tracingAgentPtr.release());
@@ -409,29 +410,30 @@ void WebDevToolsAgentImpl::initializeDeferredAgents()
m_deferredAgentsInitialized = true;
InjectedScriptManager* injectedScriptManager = m_injectedScriptManager.get();
+ LocalFrame* inspectedFrame = m_webLocalFrameImpl->frame();
- OwnPtrWillBeRawPtr<InspectorResourceAgent> resourceAgentPtr(InspectorResourceAgent::create(m_pageAgent));
+ OwnPtrWillBeRawPtr<InspectorResourceAgent> resourceAgentPtr(InspectorResourceAgent::create(inspectedFrame));
m_resourceAgent = resourceAgentPtr.get();
m_agents.append(resourceAgentPtr.release());
- OwnPtrWillBeRawPtr<InspectorCSSAgent> cssAgentPtr(InspectorCSSAgent::create(m_domAgent, m_pageAgent, m_resourceAgent));
+ OwnPtrWillBeRawPtr<InspectorCSSAgent> cssAgentPtr(InspectorCSSAgent::create(inspectedFrame, m_domAgent, m_pageAgent, m_resourceAgent));
m_cssAgent = cssAgentPtr.get();
m_agents.append(cssAgentPtr.release());
- m_agents.append(InspectorAnimationAgent::create(m_pageAgent, m_domAgent));
+ m_agents.append(InspectorAnimationAgent::create(inspectedFrame, m_domAgent));
m_agents.append(InspectorMemoryAgent::create());
- m_agents.append(InspectorApplicationCacheAgent::create(m_pageAgent));
+ m_agents.append(InspectorApplicationCacheAgent::create(inspectedFrame));
- OwnPtrWillBeRawPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgent::create(PageScriptDebugServer::instance(), m_pageAgent, injectedScriptManager, m_overlay, m_pageRuntimeAgent->debuggerId()));
+ OwnPtrWillBeRawPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgent::create(inspectedFrame, PageScriptDebugServer::instance(), injectedScriptManager, m_overlay, m_pageRuntimeAgent->debuggerId()));
InspectorDebuggerAgent* debuggerAgent = debuggerAgentPtr.get();
m_agents.append(debuggerAgentPtr.release());
m_asyncCallTracker = adoptPtrWillBeNoop(new AsyncCallTracker(debuggerAgent, m_instrumentingAgents.get()));
m_agents.append(InspectorDOMDebuggerAgent::create(m_domAgent, debuggerAgent));
- m_agents.append(InspectorInputAgent::create(m_pageAgent));
+ m_agents.append(InspectorInputAgent::create(inspectedFrame));
m_agents.append(InspectorProfilerAgent::create(injectedScriptManager, m_overlay));
« Source/core/inspector/PageRuntimeAgent.h ('K') | « Source/core/inspector/PageRuntimeAgent.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698