Revert of DevTools: remove dependency of most agents on InspectorPageAgent

Source/core/inspector/PageConsoleAgent.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 20 matching lines @@
 #include "config.h"
 #include "core/inspector/PageConsoleAgent.h"
 
 #include "bindings/core/v8/ScriptController.h"
 #include "core/dom/Document.h"
 #include "core/frame/FrameConsole.h"
 #include "core/frame/FrameHost.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/inspector/ConsoleMessageStorage.h"
 #include "core/inspector/InspectorDOMAgent.h"
+#include "core/inspector/InspectorPageAgent.h"
 #include "core/workers/WorkerInspectorProxy.h"
 
 namespace blink {
 
 int PageConsoleAgent::s_enabledAgentCount = 0;
 
-PageConsoleAgent::PageConsoleAgent(LocalFrame* inspectedFrame, InjectedScriptManager* injectedScriptManager, InspectorDOMAgent* domAgent)
+PageConsoleAgent::PageConsoleAgent(InjectedScriptManager* injectedScriptManager, InspectorDOMAgent* domAgent, InspectorPageAgent* pageAgent)
     : InspectorConsoleAgent(injectedScriptManager)
-    , m_inspectedFrame(inspectedFrame)
     , m_inspectorDOMAgent(domAgent)
+    , m_pageAgent(pageAgent)
 {
 }
 
 PageConsoleAgent::~PageConsoleAgent()
 {
 #if !ENABLE(OILPAN)
     m_inspectorDOMAgent = nullptr;
     m_instrumentingAgents->setPageConsoleAgent(nullptr);
 #endif
 }
 
 DEFINE_TRACE(PageConsoleAgent)
 {
-    visitor->trace(m_inspectedFrame);
     visitor->trace(m_inspectorDOMAgent);
+    visitor->trace(m_pageAgent);
     InspectorConsoleAgent::trace(visitor);
 }
 
 void PageConsoleAgent::enable(ErrorString* errorString)
 {
     InspectorConsoleAgent::enable(errorString);
     m_workersWithEnabledConsole.clear();
     m_instrumentingAgents->setPageConsoleAgent(this);
 }
 
 void PageConsoleAgent::disable(ErrorString* errorString)
 {
     m_instrumentingAgents->setPageConsoleAgent(nullptr);
     InspectorConsoleAgent::disable(errorString);
 }
 
 void PageConsoleAgent::clearMessages(ErrorString* errorString)
 {
     m_inspectorDOMAgent->releaseDanglingNodes();
-    messageStorage()->clear(m_inspectedFrame->document());
+    messageStorage()->clear(m_pageAgent->inspectedFrame()->document());
 }
 
 void PageConsoleAgent::workerConsoleAgentEnabled(WorkerGlobalScopeProxy* proxy)
 {
     m_workersWithEnabledConsole.add(proxy);
 }
 
 ConsoleMessageStorage* PageConsoleAgent::messageStorage()
 {
-    return &m_inspectedFrame->host()->consoleMessageStorage();
+    return &m_pageAgent->frameHost()->consoleMessageStorage();
 }
 
 void PageConsoleAgent::workerTerminated(WorkerInspectorProxy* workerInspectorProxy)
 {
     WorkerGlobalScopeProxy* proxy = workerInspectorProxy->workerGlobalScopeProxy();
     if (!proxy)
         return;
 
     HashSet<WorkerGlobalScopeProxy*>::iterator iterator = m_workersWithEnabledConsole.find(proxy);
     bool workerAgentWasEnabled = iterator != m_workersWithEnabledConsole.end();
@@ skipping 18 matching lines @@
     ++s_enabledAgentCount;
 }
 
 void PageConsoleAgent::disableStackCapturingIfNeeded()
 {
     if (!(--s_enabledAgentCount))
         ScriptController::setCaptureCallStackForUncaughtExceptions(false);
 }
 
 } // namespace blink