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

Source/core/inspector/InspectorCanvasAgent.cpp

Index: Source/core/inspector/InspectorCanvasAgent.cpp
diff --git a/Source/core/inspector/InspectorCanvasAgent.cpp b/Source/core/inspector/InspectorCanvasAgent.cpp
index 7b34b4ae1352227cf32ec84e4e159ed7e57eb6a2..cacd249c29c08c4d6e43b02df41aeef97fdff710 100644
--- a/Source/core/inspector/InspectorCanvasAgent.cpp
+++ b/Source/core/inspector/InspectorCanvasAgent.cpp
@@ -141,7 +141,7 @@ void InspectorCanvasAgent::hasUninstrumentedCanvases(ErrorString* errorString, b
 
 void InspectorCanvasAgent::captureFrame(ErrorString* errorString, const FrameId* frameId, TraceLogId* traceLogId)
 {
-    LocalFrame* frame = frameId ? m_pageAgent->assertFrame(errorString, *frameId) : m_pageAgent->mainFrame();
+    LocalFrame* frame = frameId ? m_pageAgent->assertFrame(errorString, *frameId) : m_pageAgent->inspectedFrame();
     if (!frame)
         return;
     InjectedScriptCanvasModule module = injectedScriptCanvasModule(errorString, ScriptState::forMainWorld(frame));
@@ -151,7 +151,7 @@ void InspectorCanvasAgent::captureFrame(ErrorString* errorString, const FrameId*
 
 void InspectorCanvasAgent::startCapturing(ErrorString* errorString, const FrameId* frameId, TraceLogId* traceLogId)
 {
-    LocalFrame* frame = frameId ? m_pageAgent->assertFrame(errorString, *frameId) : m_pageAgent->mainFrame();
+    LocalFrame* frame = frameId ? m_pageAgent->assertFrame(errorString, *frameId) : m_pageAgent->inspectedFrame();
     if (!frame)
         return;
     InjectedScriptCanvasModule module = injectedScriptCanvasModule(errorString, ScriptState::forMainWorld(frame));
@@ -268,8 +268,8 @@ void InspectorCanvasAgent::findFramesWithUninstrumentedCanvases()
 {
     class NodeVisitor final : public WrappedNodeVisitor {
     public:
-        NodeVisitor(Page* page, FramesWithUninstrumentedCanvases& result)
-            : m_page(page)
+        NodeVisitor(LocalFrame* frame, FramesWithUninstrumentedCanvases& result)
+            : m_frame(frame)
             , m_framesWithUninstrumentedCanvases(result)
         {
         }
@@ -281,7 +281,7 @@ void InspectorCanvasAgent::findFramesWithUninstrumentedCanvases()
                 return;
 
             LocalFrame* frame = node->document().frame();
-            if (frame->page() != m_page)
+            if (frame->localFrameRoot() != m_frame)
                 return;
 
             if (toHTMLCanvasElement(node)->renderingContext())
@@ -289,9 +289,9 @@ void InspectorCanvasAgent::findFramesWithUninstrumentedCanvases()
         }
 
     private:
-        Page* m_page;
+        LocalFrame* m_frame;
         FramesWithUninstrumentedCanvases& m_framesWithUninstrumentedCanvases;
-    } nodeVisitor(m_pageAgent->page(), m_framesWithUninstrumentedCanvases);
+    } nodeVisitor(m_pageAgent->inspectedFrame(), m_framesWithUninstrumentedCanvases);
 
     m_framesWithUninstrumentedCanvases.clear();
     ScriptProfiler::visitNodeWrappers(&nodeVisitor);
@@ -318,7 +318,7 @@ void InspectorCanvasAgent::didCommitLoad(LocalFrame*, DocumentLoader* loader)
     if (!m_enabled)
         return;
     Frame* frame = loader->frame();
-    if (frame == m_pageAgent->mainFrame()) {
+    if (frame == m_pageAgent->inspectedFrame()) {
         for (auto& frame : m_framesWithUninstrumentedCanvases)
             frame.value = false;
         m_frontend->traceLogsRemoved(0, 0);