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

Source/core/inspector/InspectorCanvasAgent.cpp

 /*
  * Copyright (C) 2012 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 123 matching lines @@
         if (frame.value) {
             *result = true;
             return;
         }
     }
     *result = false;
 }
 
 void InspectorCanvasAgent::captureFrame(ErrorString* errorString, const FrameId* frameId, TraceLogId* traceLogId)
 {
-    LocalFrame* frame = frameId ? m_pageAgent->assertFrame(errorString, *frameId) : m_pageAgent->inspectedFrame();
+    LocalFrame* frame = frameId ? m_pageAgent->assertFrame(errorString, *frameId) : m_pageAgent->mainFrame();
     if (!frame)
         return;
     InjectedScriptCanvasModule module = injectedScriptCanvasModule(errorString, ScriptState::forMainWorld(frame));
     if (!module.isEmpty())
         module.captureFrame(errorString, traceLogId);
 }
 
 void InspectorCanvasAgent::startCapturing(ErrorString* errorString, const FrameId* frameId, TraceLogId* traceLogId)
 {
-    LocalFrame* frame = frameId ? m_pageAgent->assertFrame(errorString, *frameId) : m_pageAgent->inspectedFrame();
+    LocalFrame* frame = frameId ? m_pageAgent->assertFrame(errorString, *frameId) : m_pageAgent->mainFrame();
     if (!frame)
         return;
     InjectedScriptCanvasModule module = injectedScriptCanvasModule(errorString, ScriptState::forMainWorld(frame));
     if (!module.isEmpty())
         module.startCapturing(errorString, traceLogId);
 }
 
 void InspectorCanvasAgent::stopCapturing(ErrorString* errorString, const TraceLogId& traceLogId)
 {
     InjectedScriptCanvasModule module = injectedScriptCanvasModule(errorString, traceLogId);
@@ skipping 96 matching lines @@
         *errorString = "Inspected frame has gone";
         return InjectedScriptCanvasModule();
     }
     return injectedScriptCanvasModule(errorString, injectedScript.scriptState());
 }
 
 void InspectorCanvasAgent::findFramesWithUninstrumentedCanvases()
 {
     class NodeVisitor final : public WrappedNodeVisitor {
     public:
-        NodeVisitor(LocalFrame* frame, FramesWithUninstrumentedCanvases& result)
-            : m_frame(frame)
+        NodeVisitor(Page* page, FramesWithUninstrumentedCanvases& result)
+            : m_page(page)
             , m_framesWithUninstrumentedCanvases(result)
         {
         }
 
         virtual void visitNode(Node* node) override
         {
             ASSERT(node);
             if (!isHTMLCanvasElement(*node) || !node->document().frame())
                 return;
 
             LocalFrame* frame = node->document().frame();
-            if (frame->localFrameRoot() != m_frame)
+            if (frame->page() != m_page)
                 return;
 
             if (toHTMLCanvasElement(node)->renderingContext())
                 m_framesWithUninstrumentedCanvases.set(frame, true);
         }
 
     private:
-        LocalFrame* m_frame;
+        Page* m_page;
         FramesWithUninstrumentedCanvases& m_framesWithUninstrumentedCanvases;
-    } nodeVisitor(m_pageAgent->inspectedFrame(), m_framesWithUninstrumentedCanvases);
+    } nodeVisitor(m_pageAgent->page(), m_framesWithUninstrumentedCanvases);
 
     m_framesWithUninstrumentedCanvases.clear();
     ScriptProfiler::visitNodeWrappers(&nodeVisitor);
 
     if (m_frontend) {
         for (const auto& frame : m_framesWithUninstrumentedCanvases) {
             String frameId = m_pageAgent->frameId(frame.key);
             if (!frameId.isEmpty())
                 m_frontend->contextCreated(frameId);
         }
     }
 }
 
 bool InspectorCanvasAgent::checkIsEnabled(ErrorString* errorString) const
 {
     if (m_enabled)
         return true;
     *errorString = "Canvas agent is not enabled";
     return false;
 }
 
 void InspectorCanvasAgent::didCommitLoad(LocalFrame*, DocumentLoader* loader)
 {
     if (!m_enabled)
         return;
     Frame* frame = loader->frame();
-    if (frame == m_pageAgent->inspectedFrame()) {
+    if (frame == m_pageAgent->mainFrame()) {
         for (auto& frame : m_framesWithUninstrumentedCanvases)
             frame.value = false;
         m_frontend->traceLogsRemoved(0, 0);
     } else {
         while (frame) {
             if (frame->isLocalFrame()) {
                 LocalFrame* localFrame = toLocalFrame(frame);
                 if (m_framesWithUninstrumentedCanvases.contains(localFrame))
                     m_framesWithUninstrumentedCanvases.set(localFrame, false);
                 if (m_pageAgent->hasIdForFrame(localFrame)) {
@@ skipping 19 matching lines @@
     ErrorString error;
     for (const auto& frame : m_framesWithUninstrumentedCanvases) {
         InjectedScriptCanvasModule module = injectedScriptCanvasModule(&error, ScriptState::forMainWorld(frame.key));
         if (!module.isEmpty())
             module.markFrameEnd();
     }
 }
 
 } // namespace blink