cc: Move more functionality from host to LayerTreeImpl

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"
@@ skipping 196 matching lines @@
 
     void readback(void* pixels, const gfx::Rect&);
 
     LayerTreeImpl* activeTree() { return m_activeTree.get(); }
     const LayerTreeImpl* activeTree() const { return m_activeTree.get(); }
     LayerTreeImpl* pendingTree() { return m_pendingTree.get(); }
     const LayerTreeImpl* pendingTree() const { return m_pendingTree.get(); }
     void createPendingTree();
     void activatePendingTreeIfNeeded();
 
-    // TODO(nduca): Remove these in favor of LayerTreeImpl.
-    void setRootLayer(scoped_ptr<LayerImpl>);
+    // Shortcuts to layers on the active tree.
     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;
-
-    // TOOD(nduca): This goes away when scrolling moves to LayerTreeImpl.

[danakj, 2012/12/31 15:18:38]

Just double checking that you meant to remove this TOOD without removing the
method it speaks about.

[enne (OOO), 2012/12/31 23:52:36]

Definitely intended.  This is what I obliquely was waving my hands at in the
first paragraph of the CL description about methods that could stay on the host.

     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);
     const gfx::Size& layoutViewportSize() const { return m_layoutViewportSize; }
 
     float deviceScaleFactor() const { return m_deviceScaleFactor; }
     void setDeviceScaleFactor(float);
 
     float pageScaleFactor() const;
     void setPageScaleFactorAndLimits(float pageScaleFactor, float minPageScaleFactor, float maxPageScaleFactor);
 
     scoped_ptr<ScrollAndScaleSet> processScrollDeltas();
     gfx::Transform implTransform() const;
 
     void startPageScaleAnimation(gfx::Vector2d targetOffset, bool useAnchor, float scale, base::TimeDelta duration);
 
-    SkColor backgroundColor() const { return m_backgroundColor; }
-    void setBackgroundColor(SkColor color) { m_backgroundColor = color; }
-
-    bool hasTransparentBackground() const { return m_hasTransparentBackground; }
-    void setHasTransparentBackground(bool transparent) { m_hasTransparentBackground = transparent; }
     bool needsAnimateLayers() const { return !m_animationRegistrar->active_animation_controllers().empty(); }
 
     bool needsUpdateDrawProperties() const { return m_needsUpdateDrawProperties; }
     void setNeedsUpdateDrawProperties() { m_needsUpdateDrawProperties = true; }
 
     void setNeedsRedraw();
 
     void renderingStats(RenderingStats*) const;
 
     void sendManagedMemoryStats(
@@ skipping 103 matching lines @@
     bool m_scrollDeltaIsInViewportSpace;
     LayerTreeSettings m_settings;
     LayerTreeDebugState m_debugState;
     gfx::Size m_layoutViewportSize;
     gfx::Size m_deviceViewportSize;
     float m_deviceScaleFactor;
     bool m_visible;
     bool m_contentsTexturesPurged;
     ManagedMemoryPolicy m_managedMemoryPolicy;
 
-    SkColor m_backgroundColor;
-    bool m_hasTransparentBackground;
-
     bool m_needsUpdateDrawProperties;
     bool m_pinchGestureActive;
     gfx::Point m_previousPinchAnchor;
 
     scoped_ptr<PageScaleAnimation> m_pageScaleAnimation;
 
     // This is used for ticking animations slowly when hidden.
     scoped_ptr<LayerTreeHostImplTimeSourceAdapter> m_timeSourceClientAdapter;
 
     PinchZoomViewport m_pinchZoomViewport;
@@ skipping 13 matching lines @@
     size_t m_lastSentMemoryUseBytes;
 
     scoped_ptr<AnimationRegistrar> m_animationRegistrar;
 
     DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYER_TREE_HOST_IMPL_H_