Revert of DevTools: remove dependency of most agents on InspectorPageAgent

Source/web/WebDevToolsAgentImpl.cpp

Index: Source/web/WebDevToolsAgentImpl.cpp
diff --git a/Source/web/WebDevToolsAgentImpl.cpp b/Source/web/WebDevToolsAgentImpl.cpp
index c4834815651e8856d19e12d07840e18b106b7529..43523e075ca59f71dc83b349bbfa42f08cb3f62a 100644
--- a/Source/web/WebDevToolsAgentImpl.cpp
+++ b/Source/web/WebDevToolsAgentImpl.cpp
@@ -306,21 +306,20 @@
     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(inspectedFrame, m_overlay));
+    OwnPtrWillBeRawPtr<InspectorPageAgent> pageAgentPtr(InspectorPageAgent::create(m_webLocalFrameImpl->frame(), m_overlay));
     m_pageAgent = pageAgentPtr.get();
     m_agents.append(pageAgentPtr.release());
 
-    OwnPtrWillBeRawPtr<InspectorDOMAgent> domAgentPtr(InspectorDOMAgent::create(inspectedFrame, injectedScriptManager, m_overlay));
+    OwnPtrWillBeRawPtr<InspectorDOMAgent> domAgentPtr(InspectorDOMAgent::create(m_pageAgent, injectedScriptManager, m_overlay));
     m_domAgent = domAgentPtr.get();
     m_agents.append(domAgentPtr.release());
 
-    OwnPtrWillBeRawPtr<InspectorLayerTreeAgent> layerTreeAgentPtr(InspectorLayerTreeAgent::create(inspectedFrame));
+    OwnPtrWillBeRawPtr<InspectorLayerTreeAgent> layerTreeAgentPtr(InspectorLayerTreeAgent::create(m_pageAgent));
     m_layerTreeAgent = layerTreeAgentPtr.get();
     m_agents.append(layerTreeAgentPtr.release());
 
@@ -329,16 +328,16 @@
     ClientMessageLoopAdapter::ensurePageScriptDebugServerCreated(m_client);
     PageScriptDebugServer* scriptDebugServer = PageScriptDebugServer::instance();
 
-    OwnPtrWillBeRawPtr<PageRuntimeAgent> pageRuntimeAgentPtr(PageRuntimeAgent::create(inspectedFrame, injectedScriptManager, this, scriptDebugServer));
+    OwnPtrWillBeRawPtr<PageRuntimeAgent> pageRuntimeAgentPtr(PageRuntimeAgent::create(injectedScriptManager, this, scriptDebugServer, m_pageAgent));
     m_pageRuntimeAgent = pageRuntimeAgentPtr.get();
     m_agents.append(pageRuntimeAgentPtr.release());
 
-    OwnPtrWillBeRawPtr<PageConsoleAgent> pageConsoleAgentPtr = PageConsoleAgent::create(inspectedFrame, injectedScriptManager, m_domAgent);
+    OwnPtrWillBeRawPtr<PageConsoleAgent> pageConsoleAgentPtr = PageConsoleAgent::create(injectedScriptManager, m_domAgent, m_pageAgent);
     m_pageConsoleAgent = pageConsoleAgentPtr.get();
 
     OwnPtrWillBeRawPtr<InspectorWorkerAgent> workerAgentPtr = InspectorWorkerAgent::create(pageConsoleAgentPtr.get());
 
-    OwnPtrWillBeRawPtr<InspectorTracingAgent> tracingAgentPtr = InspectorTracingAgent::create(inspectedFrame, this, workerAgentPtr.get());
+    OwnPtrWillBeRawPtr<InspectorTracingAgent> tracingAgentPtr = InspectorTracingAgent::create(this, workerAgentPtr.get(), m_pageAgent);
     m_tracingAgent = tracingAgentPtr.get();
     m_agents.append(tracingAgentPtr.release());
 
@@ -398,9 +397,9 @@
 void WebDevToolsAgentImpl::willBeDestroyed()
 {
 #if ENABLE(ASSERT)
-    LocalFrame* frame = m_webLocalFrameImpl->frame();
+    Frame* frame = m_webLocalFrameImpl->frame();
     ASSERT(frame);
-    ASSERT(frame->view());
+    ASSERT(m_pageAgent->inspectedFrame()->view());
 #endif
 
     detach();
@@ -416,30 +415,29 @@
     m_deferredAgentsInitialized = true;
 
     InjectedScriptManager* injectedScriptManager = m_injectedScriptManager.get();
-    LocalFrame* inspectedFrame = m_webLocalFrameImpl->frame();
-
-    OwnPtrWillBeRawPtr<InspectorResourceAgent> resourceAgentPtr(InspectorResourceAgent::create(inspectedFrame));
+
+    OwnPtrWillBeRawPtr<InspectorResourceAgent> resourceAgentPtr(InspectorResourceAgent::create(m_pageAgent));
     m_resourceAgent = resourceAgentPtr.get();
     m_agents.append(resourceAgentPtr.release());
 
-    OwnPtrWillBeRawPtr<InspectorCSSAgent> cssAgentPtr(InspectorCSSAgent::create(inspectedFrame, m_domAgent, m_pageAgent, m_resourceAgent));
+    OwnPtrWillBeRawPtr<InspectorCSSAgent> cssAgentPtr(InspectorCSSAgent::create(m_domAgent, m_pageAgent, m_resourceAgent));
     m_cssAgent = cssAgentPtr.get();
     m_agents.append(cssAgentPtr.release());
 
-    m_agents.append(InspectorAnimationAgent::create(inspectedFrame, m_domAgent));
+    m_agents.append(InspectorAnimationAgent::create(m_pageAgent, m_domAgent));
 
     m_agents.append(InspectorMemoryAgent::create());
 
-    m_agents.append(InspectorApplicationCacheAgent::create(inspectedFrame));
-
-    OwnPtrWillBeRawPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgent::create(inspectedFrame, PageScriptDebugServer::instance(), injectedScriptManager, m_overlay, m_pageRuntimeAgent->debuggerId()));
+    m_agents.append(InspectorApplicationCacheAgent::create(m_pageAgent));
+
+    OwnPtrWillBeRawPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgent::create(PageScriptDebugServer::instance(), m_pageAgent, 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(inspectedFrame));
+    m_agents.append(InspectorInputAgent::create(m_pageAgent));
 
     m_agents.append(InspectorProfilerAgent::create(injectedScriptManager, m_overlay));