DevTools: use per-LocalFrame instrumenting agents instead of per-Page ones.

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 66 matching lines @@
 }
 
 void PageDebuggerAgent::disable()
 {
     InspectorDebuggerAgent::disable();
     m_instrumentingAgents->setPageDebuggerAgent(0);
 }
 
 void PageDebuggerAgent::startListeningScriptDebugServer()
 {
-    scriptDebugServer().addListener(this, m_pageAgent->page());
+    scriptDebugServer().addListener(this, m_pageAgent->inspectedFrame());
 }
 
 void PageDebuggerAgent::stopListeningScriptDebugServer()
 {
-    scriptDebugServer().removeListener(this, m_pageAgent->page());
+    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_pageAgent->mainFrame());
+        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::didClearDocumentOfWindowObject(LocalFrame* frame)
 {
-    if (frame != m_pageAgent->mainFrame())
+    // FIXME: what about nested objects?
+    if (frame != m_pageAgent->inspectedFrame())
         return;
 
     reset();
 
     scriptDebugServer().setPreprocessorSource(String());
     ASSERT(m_pageAgent);
     if (!m_pageAgent->scriptPreprocessorSource().isEmpty())
         scriptDebugServer().setPreprocessorSource(m_pageAgent->scriptPreprocessorSource());
 }
 
 void PageDebuggerAgent::didCommitLoad(LocalFrame* frame, DocumentLoader* loader)
 {
-    Frame* mainFrame = frame->page()->deprecatedLocalMainFrame();
-    if (loader->frame() == mainFrame)
+    if (loader->frame() == m_pageAgent->inspectedFrame())
         pageDidCommitLoad();
 }
 
 } // namespace blink