Revert of DevTools: remove dependency of most agents on InspectorPageAgent

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/DOMNodeIds.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/InspectorPageAgent.h"
 #include "core/inspector/InspectorState.h"
 #include "core/inspector/InstrumentingAgents.h"
 #include "core/layout/LayoutPart.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/compositing/CompositedDeprecatedPaintLayerMapping.h"
 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h"
 #include "core/loader/DocumentLoader.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/graphics/CompositingReasons.h"
 #include "platform/graphics/GraphicsLayer.h"
@@ skipping 86 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(LocalFrame* inspectedFrame)
+InspectorLayerTreeAgent::InspectorLayerTreeAgent(InspectorPageAgent* pageAgent)
     : InspectorBaseAgent<InspectorLayerTreeAgent, InspectorFrontend::LayerTree>("LayerTree")
-    , m_inspectedFrame(inspectedFrame)
+    , m_pageAgent(pageAgent)
 {
 }
 
 InspectorLayerTreeAgent::~InspectorLayerTreeAgent()
 {
 }
 
 DEFINE_TRACE(InspectorLayerTreeAgent)
 {
-    visitor->trace(m_inspectedFrame);
+    visitor->trace(m_pageAgent);
     InspectorBaseAgent::trace(visitor);
 }
 
 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);
-    Document* document = m_inspectedFrame->document();
-    if (document && document->lifecycle().state() >= DocumentLifecycle::CompositingClean)
-        layerTreeDidChange();
+    if (LocalFrame* frame = m_pageAgent->inspectedFrame()) {
+        Document* document = frame->document();
+        if (document && document->lifecycle().state() >= DocumentLifecycle::CompositingClean)
+            layerTreeDidChange();
+    }
 }
 
 void InspectorLayerTreeAgent::disable(ErrorString*)
 {
     m_instrumentingAgents->setInspectorLayerTreeAgent(0);
     m_snapshotById.clear();
     ErrorString unused;
 }
 
 void InspectorLayerTreeAgent::layerTreeDidChange()
@@ skipping 59 matching lines @@
         gatherGraphicsLayers(root->children()[i], layerIdToNodeIdMap, layers);
 }
 
 int InspectorLayerTreeAgent::idForNode(Node* node)
 {
     return DOMNodeIds::idForNode(node);
 }
 
 DeprecatedPaintLayerCompositor* InspectorLayerTreeAgent::deprecatedPaintLayerCompositor()
 {
-    LayoutView* layoutView = m_inspectedFrame->contentRenderer();
+    LayoutView* layoutView = m_pageAgent->inspectedFrame()->contentRenderer();
     DeprecatedPaintLayerCompositor* compositor = layoutView ? layoutView->compositor() : nullptr;
     return compositor;
 }
 
 GraphicsLayer* InspectorLayerTreeAgent::rootGraphicsLayer()
 {
-    return m_inspectedFrame->host()->pinchViewport().rootGraphicsLayer();
+    return m_pageAgent->frameHost()->pinchViewport().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))
             return layer;
     }
@@ skipping 187 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