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

Source/core/inspector/InspectorLayerTreeAgent.cpp

 /*
  * Copyright (C) 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2013 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.
@@ skipping 21 matching lines @@
 #include "config.h"
 
 #include "core/inspector/InspectorLayerTreeAgent.h"
 
 #include "core/dom/Document.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/inspector/IdentifiersFactory.h"
 #include "core/inspector/InspectorNodeIds.h"
-#include "core/inspector/InspectorPageAgent.h"
 #include "core/inspector/InspectorState.h"
 #include "core/inspector/InstrumentingAgents.h"
 #include "core/layout/compositing/CompositedLayerMapping.h"
 #include "core/layout/compositing/RenderLayerCompositor.h"
 #include "core/loader/DocumentLoader.h"
+#include "core/page/Page.h"
 #include "core/rendering/RenderPart.h"
 #include "core/rendering/RenderView.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/graphics/CompositingReasons.h"
 #include "platform/graphics/PictureSnapshot.h"
 #include "platform/graphics/paint/DisplayItemList.h"
 #include "platform/image-encoders/skia/PNGImageEncoder.h"
 #include "platform/transforms/TransformationMatrix.h"
 #include "public/platform/WebFloatPoint.h"
 #include "public/platform/WebLayer.h"
@@ skipping 79 matching lines @@
         else
             layerObject->setAnchorY(0.0);
         layerObject->setAnchorZ(transformOrigin.z());
     }
     RefPtr<TypeBuilder::Array<TypeBuilder::LayerTree::ScrollRect> > scrollRects = buildScrollRectsForLayer(graphicsLayer);
     if (scrollRects)
         layerObject->setScrollRects(scrollRects.release());
     return layerObject;
 }
 
-InspectorLayerTreeAgent::InspectorLayerTreeAgent(InspectorPageAgent* pageAgent)
+InspectorLayerTreeAgent::InspectorLayerTreeAgent(Page* page)
     : InspectorBaseAgent<InspectorLayerTreeAgent>("LayerTree")
     , m_frontend(0)
-    , m_pageAgent(pageAgent)
+    , m_page(page)
 {
 }
 
 InspectorLayerTreeAgent::~InspectorLayerTreeAgent()
 {
 }
 
 void InspectorLayerTreeAgent::trace(Visitor* visitor)
 {
-    visitor->trace(m_pageAgent);
+    visitor->trace(m_page);
     InspectorBaseAgent::trace(visitor);
 }
 
 void InspectorLayerTreeAgent::setFrontend(InspectorFrontend* frontend)
 {
     m_frontend = frontend->layertree();
 }
 
 void InspectorLayerTreeAgent::clearFrontend()
 {
     m_frontend = nullptr;
     disable(0);
 }
 
 void InspectorLayerTreeAgent::restore()
 {
     // We do not re-enable layer agent automatically after navigation. This is because
     // it depends on DOMAgent and node ids in particular, so we let front-end request document
     // and re-enable the agent manually after this.
 }
 
 void InspectorLayerTreeAgent::enable(ErrorString*)
 {
     m_instrumentingAgents->setInspectorLayerTreeAgent(this);
-    if (LocalFrame* frame = m_pageAgent->inspectedFrame()) {
+    if (LocalFrame* frame = m_page->deprecatedLocalMainFrame()) {
         Document* document = frame->document();
         if (document && document->lifecycle().state() >= DocumentLifecycle::CompositingClean)
             layerTreeDidChange();
     }
 }
 
 void InspectorLayerTreeAgent::disable(ErrorString*)
 {
     m_instrumentingAgents->setInspectorLayerTreeAgent(0);
     m_snapshotById.clear();
@@ skipping 63 matching lines @@
         gatherGraphicsLayers(root->children()[i], layerIdToNodeIdMap, layers);
 }
 
 int InspectorLayerTreeAgent::idForNode(Node* node)
 {
     return InspectorNodeIds::idForNode(node);
 }
 
 RenderLayerCompositor* InspectorLayerTreeAgent::renderLayerCompositor()
 {
-    RenderView* renderView = m_pageAgent->inspectedFrame()->contentRenderer();
+    RenderView* renderView = m_page->deprecatedLocalMainFrame()->contentRenderer();
     RenderLayerCompositor* compositor = renderView ? renderView->compositor() : nullptr;
     return compositor;
 }
 
 GraphicsLayer* InspectorLayerTreeAgent::rootGraphicsLayer()
 {
-    if (m_pageAgent->frameHost()->settings().pinchVirtualViewportEnabled())
-        return m_pageAgent->frameHost()->pinchViewport().rootGraphicsLayer();
+    if (m_page->settings().pinchVirtualViewportEnabled())
+        return m_page->frameHost().pinchViewport().rootGraphicsLayer();
 
     return renderLayerCompositor()->rootGraphicsLayer();
 }
 
 static GraphicsLayer* findLayerById(GraphicsLayer* root, int layerId)
 {
     if (root->platformLayer()->id() == layerId)
         return root;
     if (root->replicaLayer()) {
         if (GraphicsLayer* layer = findLayerById(root->replicaLayer(), layerId))
@@ skipping 198 matching lines @@
 void InspectorLayerTreeAgent::didRemovePageOverlay(const GraphicsLayer* layer)
 {
     size_t index = m_pageOverlayLayerIds.find(layer->platformLayer()->id());
     if (index == WTF::kNotFound)
         return;
     m_pageOverlayLayerIds.remove(index);
 }
 
 
 } // namespace blink