Revert of DevTools: remove dependency of most agents on InspectorPageAgent

Source/core/inspector/PageDebuggerAgent.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/PageDebuggerAgent.h"
 
 #include "bindings/core/v8/DOMWrapperWorld.h"
 #include "bindings/core/v8/ScriptController.h"
 #include "bindings/core/v8/ScriptSourceCode.h"
 #include "core/frame/FrameConsole.h"
 #include "core/frame/LocalFrame.h"
 #include "core/inspector/InjectedScript.h"
 #include "core/inspector/InspectorOverlay.h"
+#include "core/inspector/InspectorPageAgent.h"
 #include "core/inspector/InstrumentingAgents.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/page/Page.h"
 
 namespace blink {
 
-PassOwnPtrWillBeRawPtr<PageDebuggerAgent> PageDebuggerAgent::create(LocalFrame* inspectedFrame, PageScriptDebugServer* pageScriptDebugServer, InjectedScriptManager* injectedScriptManager, InspectorOverlay* overlay, int debuggerId)
+PassOwnPtrWillBeRawPtr<PageDebuggerAgent> PageDebuggerAgent::create(PageScriptDebugServer* pageScriptDebugServer, InspectorPageAgent* pageAgent, InjectedScriptManager* injectedScriptManager, InspectorOverlay* overlay, int debuggerId)
 {
-    return adoptPtrWillBeNoop(new PageDebuggerAgent(inspectedFrame, pageScriptDebugServer, injectedScriptManager, overlay, debuggerId));
+    return adoptPtrWillBeNoop(new PageDebuggerAgent(pageScriptDebugServer, pageAgent, injectedScriptManager, overlay, debuggerId));
 }
 
-PageDebuggerAgent::PageDebuggerAgent(LocalFrame* inspectedFrame, PageScriptDebugServer* pageScriptDebugServer, InjectedScriptManager* injectedScriptManager, InspectorOverlay* overlay, int debuggerId)
+PageDebuggerAgent::PageDebuggerAgent(PageScriptDebugServer* pageScriptDebugServer, InspectorPageAgent* pageAgent, InjectedScriptManager* injectedScriptManager, InspectorOverlay* overlay, int debuggerId)
     : InspectorDebuggerAgent(injectedScriptManager)
-    , m_inspectedFrame(inspectedFrame)
     , m_pageScriptDebugServer(pageScriptDebugServer)
+    , m_pageAgent(pageAgent)
     , m_overlay(overlay)
     , m_debuggerId(debuggerId)
 {
     m_overlay->setListener(this);
 }
 
 PageDebuggerAgent::~PageDebuggerAgent()
 {
 }
 
 DEFINE_TRACE(PageDebuggerAgent)
 {
-    visitor->trace(m_inspectedFrame);
     visitor->trace(m_pageScriptDebugServer);
+    visitor->trace(m_pageAgent);
     visitor->trace(m_overlay);
     InspectorDebuggerAgent::trace(visitor);
 }
 
 void PageDebuggerAgent::enable()
 {
     InspectorDebuggerAgent::enable();
     m_instrumentingAgents->setPageDebuggerAgent(this);
 }
 
 void PageDebuggerAgent::disable()
 {
     InspectorDebuggerAgent::disable();
     m_instrumentingAgents->setPageDebuggerAgent(0);
 }
 
 void PageDebuggerAgent::startListeningScriptDebugServer()
 {
-    scriptDebugServer().addListener(this, m_inspectedFrame, m_debuggerId);
+    scriptDebugServer().addListener(this, m_pageAgent->inspectedFrame(), m_debuggerId);
 }
 
 void PageDebuggerAgent::stopListeningScriptDebugServer()
 {
-    scriptDebugServer().removeListener(this, m_inspectedFrame);
+    scriptDebugServer().removeListener(this, m_pageAgent->inspectedFrame());
 }
 
 PageScriptDebugServer& PageDebuggerAgent::scriptDebugServer()
 {
     return *m_pageScriptDebugServer;
 }
 
 void PageDebuggerAgent::muteConsole()
 {
     FrameConsole::mute();
@@ skipping 12 matching lines @@
 
 void PageDebuggerAgent::overlaySteppedOver()
 {
     ErrorString error;
     stepOver(&error);
 }
 
 InjectedScript PageDebuggerAgent::injectedScriptForEval(ErrorString* errorString, const int* executionContextId)
 {
     if (!executionContextId) {
-        ScriptState* scriptState = ScriptState::forMainWorld(m_inspectedFrame);
+        ScriptState* scriptState = ScriptState::forMainWorld(m_pageAgent->inspectedFrame());
         InjectedScript result = injectedScriptManager()->injectedScriptFor(scriptState);
         if (result.isEmpty())
             *errorString = "Internal error: main world execution context not found.";
         return result;
     }
     InjectedScript injectedScript = injectedScriptManager()->injectedScriptForId(*executionContextId);
     if (injectedScript.isEmpty())
         *errorString = "Execution context with given id not found.";
     return injectedScript;
 }
 
 void PageDebuggerAgent::didStartProvisionalLoad(LocalFrame* frame)
 {
-    if (frame == m_inspectedFrame) {
+    if (frame == m_pageAgent->inspectedFrame()) {
         ErrorString error;
         resume(&error);
     }
 }
 
 void PageDebuggerAgent::didClearDocumentOfWindowObject(LocalFrame* frame)
 {
     // FIXME: what about nested objects?
-    if (frame != m_inspectedFrame)
+    if (frame != m_pageAgent->inspectedFrame())
         return;
     reset();
 }
 
 void PageDebuggerAgent::didCommitLoadForLocalFrame(LocalFrame*)
 {
     resetModifiedSources();
 }
 
 } // namespace blink