[cc] Make LayerImpls point at LayerTreeImpl instead of LTHI

cc/layer_tree_host_impl.h

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_LAYER_TREE_HOST_IMPL_H_
 #define CC_LAYER_TREE_HOST_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "cc/animation_events.h"
 #include "cc/cc_export.h"
 #include "cc/input_handler.h"
-#include "cc/layer_tree_impl.h"
 #include "cc/output_surface_client.h"
 #include "cc/render_pass.h"
 #include "cc/render_pass_sink.h"
 #include "cc/renderer.h"
 #include "cc/tile_manager.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/rect.h"
 
 namespace cc {
 
 class CompletionEvent;
 class DebugRectHistory;
 class FrameRateCounter;
 class LayerImpl;
 class LayerTreeHostImplTimeSourceAdapter;
+class LayerTreeImpl;
 class PageScaleAnimation;
 class RenderPassDrawQuad;
 class ResourceProvider;
 struct RendererCapabilities;
 struct RenderingStats;
 
 // LayerTreeHost->Proxy callback interface.
 class LayerTreeHostImplClient {
 public:
     virtual void didLoseOutputSurfaceOnImplThread() = 0;
@@ skipping 65 matching lines @@
     float m_deviceScaleFactor;
 
     gfx::Vector2dF m_zoomedViewportOffset;
     gfx::SizeF m_layoutViewportSize;
 };
 
 // LayerTreeHostImpl owns the LayerImpl tree as well as associated rendering state
 class CC_EXPORT LayerTreeHostImpl : public InputHandlerClient,
                                     public RendererClient,
                                     public TileManagerClient,
-                                    public LayerTreeImplClient,
                                     public OutputSurfaceClient {
     typedef std::vector<LayerImpl*> LayerList;
 
 public:
     static scoped_ptr<LayerTreeHostImpl> create(const LayerTreeSettings&, LayerTreeHostImplClient*, Proxy*);
     virtual ~LayerTreeHostImpl();
 
     // InputHandlerClient implementation
     virtual InputHandlerClient::ScrollStatus scrollBegin(gfx::Point, InputHandlerClient::ScrollInputType) OVERRIDE;
     virtual bool scrollBy(const gfx::Point&, const gfx::Vector2d&) OVERRIDE;
@@ skipping 47 matching lines @@
     virtual bool hasImplThread() const OVERRIDE;
 
     // TileManagerClient implementation.
     virtual void ScheduleManageTiles() OVERRIDE;
     virtual void ScheduleCheckForCompletedSetPixels() OVERRIDE;
 
     // OutputSurfaceClient implementation.
     virtual void OnVSyncParametersChanged(base::TimeTicks timebase, base::TimeDelta interval) OVERRIDE;
     virtual void OnSendFrameToParentCompositorAck(const CompositorFrameAck&) OVERRIDE;
 
-    // LayerTreeImplClient implementation.
-    virtual void OnCanDrawStateChangedForTree(LayerTreeImpl*) OVERRIDE;
+    // Called from LayerTreeImpl.
+    void OnCanDrawStateChangedForTree(LayerTreeImpl*);
 
     // Implementation
     bool canDraw();
     OutputSurface* outputSurface() const;
 
     std::string layerTreeAsText() const;
     std::string layerTreeAsJson() const;
 
     void finishAllRendering();
     int sourceAnimationFrameNumber() const;
 
     bool initializeRenderer(scoped_ptr<OutputSurface>);
     bool isContextLost();
     TileManager* tileManager() { return m_tileManager.get(); }
     Renderer* renderer() { return m_renderer.get(); }
     const RendererCapabilities& rendererCapabilities() const;
 
     bool swapBuffers();
 
     void readback(void* pixels, const gfx::Rect&);
 
     LayerTreeImpl* activeTree() { return m_activeTree.get(); }
 
     // TODO(nduca): Remove these in favor of LayerTreeImpl.
     void setRootLayer(scoped_ptr<LayerImpl>);
-    LayerImpl* rootLayer() const { return m_activeTree->RootLayer(); }
+    LayerImpl* rootLayer() const;
 
     // Release ownership of the current layer tree and replace it with an empty
     // tree. Returns the root layer of the detached tree.
     scoped_ptr<LayerImpl> detachLayerTree();
 
-    LayerImpl* rootScrollLayer() const { return m_activeTree->root_scroll_layer(); }
+    LayerImpl* rootScrollLayer() const;
 
     // TOOD(nduca): This goes away when scrolling moves to LayerTreeImpl.
-    LayerImpl* currentlyScrollingLayer() const { return m_activeTree->currently_scrolling_layer(); }
+    LayerImpl* currentlyScrollingLayer() const;
 
     bool visible() const { return m_visible; }
     void setVisible(bool);
 
     bool contentsTexturesPurged() const { return m_contentsTexturesPurged; }
     void setContentsTexturesPurged();
     void resetContentsTexturesPurged();
     size_t memoryAllocationLimitBytes() const { return m_managedMemoryPolicy.bytesLimitWhenVisible; }
 
     void setViewportSize(const gfx::Size& layoutViewportSize, const gfx::Size& deviceViewportSize);
@@ skipping 168 matching lines @@
     size_t m_lastSentMemoryVisibleBytes;
     size_t m_lastSentMemoryVisibleAndNearbyBytes;
     size_t m_lastSentMemoryUseBytes;
 
     DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYER_TREE_HOST_IMPL_H_