Revert 171714 - Use an auxiliary list of animation controllers.

cc/layer_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_IMPL_H_
 #define CC_LAYER_IMPL_H_
 
 #include <public/WebFilterOperations.h>
 #include <string>
 
@@ skipping 24 matching lines @@
 
 class LayerTreeHostImpl;
 class QuadSink;
 class Renderer;
 class ScrollbarAnimationController;
 class ScrollbarLayerImpl;
 class Layer;
 
 struct AppendQuadsData;
 
-class CC_EXPORT LayerImpl {
+class CC_EXPORT LayerImpl : public LayerAnimationControllerClient {
 public:
     typedef ScopedPtrVector<LayerImpl> LayerList;
 
     static scoped_ptr<LayerImpl> create(LayerTreeHostImpl* hostImpl, int id)
     {
         return make_scoped_ptr(new LayerImpl(hostImpl, id));
     }
 
     virtual ~LayerImpl();
 
-    int id() const;
+    // LayerAnimationControllerClient implementation.
+    virtual int id() const OVERRIDE;
+    virtual void setOpacityFromAnimation(float) OVERRIDE;
+    virtual float opacity() const OVERRIDE;
+    virtual void setTransformFromAnimation(const gfx::Transform&) OVERRIDE;
+    virtual const gfx::Transform& transform() const OVERRIDE;
 
     // Tree structure.
     LayerImpl* parent() { return m_parent; }
     const LayerImpl* parent() const { return m_parent; }
     const LayerList& children() const { return m_children; }
     void addChild(scoped_ptr<LayerImpl>);
     void removeFromParent();
     void removeAllChildren();
 
     void setMaskLayer(scoped_ptr<LayerImpl>);
@@ skipping 55 matching lines @@
     void setFilter(const skia::RefPtr<SkImageFilter>&);
     skia::RefPtr<SkImageFilter> filter() const { return m_filter; }
 
     void setMasksToBounds(bool);
     bool masksToBounds() const { return m_masksToBounds; }
 
     void setContentsOpaque(bool);
     bool contentsOpaque() const { return m_contentsOpaque; }
 
     void setOpacity(float);
-    float opacity() const;
     bool opacityIsAnimating() const;
 
     void setPosition(const gfx::PointF&);
     const gfx::PointF& position() const { return m_position; }
 
     void setIsContainerForFixedPositionLayers(bool isContainerForFixedPositionLayers) { m_isContainerForFixedPositionLayers = isContainerForFixedPositionLayers; }
     bool isContainerForFixedPositionLayers() const { return m_isContainerForFixedPositionLayers; }
 
     void setFixedToContainerLayer(bool fixedToContainerLayer = true) { m_fixedToContainerLayer = fixedToContainerLayer;}
     bool fixedToContainerLayer() const { return m_fixedToContainerLayer; }
@@ skipping 88 matching lines @@
 
     void setDrawCheckerboardForMissingTiles(bool checkerboard) { m_drawCheckerboardForMissingTiles = checkerboard; }
     bool drawCheckerboardForMissingTiles() const;
 
     InputHandlerClient::ScrollStatus tryScroll(const gfx::PointF& screenSpacePoint, InputHandlerClient::ScrollInputType) const;
 
     bool doubleSided() const { return m_doubleSided; }
     void setDoubleSided(bool);
 
     void setTransform(const gfx::Transform&);
-    const gfx::Transform& transform() const;
     bool transformIsAnimating() const;
 
     const gfx::RectF& updateRect() const { return m_updateRect; }
     void setUpdateRect(const gfx::RectF& updateRect) { m_updateRect = updateRect; }
 
     std::string layerTreeAsText() const;
     virtual base::DictionaryValue* layerTreeAsJson() const;
 
     void setStackingOrderChanged(bool);
 
@@ skipping 85 matching lines @@
     bool m_layerPropertyChanged;
 
     // Indicates that a property has changed on this layer that would not
     // affect the pixels on its target surface, but would require redrawing
     // but would require redrawing the targetSurface onto its ancestor targetSurface.
     // For layers that do not own a surface this flag acts as m_layerPropertyChanged.
     bool m_layerSurfacePropertyChanged;
 
     bool m_masksToBounds;
     bool m_contentsOpaque;
+    float m_opacity;
     gfx::PointF m_position;
     bool m_preserves3D;
     bool m_useParentBackfaceVisibility;
     bool m_drawCheckerboardForMissingTiles;
     gfx::Transform m_sublayerTransform;
+    gfx::Transform m_transform;
     bool m_useLCDText;
 
     bool m_drawsContent;
     bool m_forceRenderSurface;
 
     // Set for the layer that other layers are fixed to.
     bool m_isContainerForFixedPositionLayers;
     // This is true if the layer should be fixed to the closest ancestor container.
     bool m_fixedToContainerLayer;
 
@@ skipping 16 matching lines @@
 #ifndef NDEBUG
     bool m_betweenWillDrawAndDidDraw;
 #endif
 
     // Rect indicating what was repainted/updated during update.
     // Note that plugin layers bypass this and leave it empty.
     // Uses layer's content space.
     gfx::RectF m_updateRect;
 
     // Manages animations for this layer.
-    scoped_refptr<LayerAnimationController> m_layerAnimationController;
+    scoped_ptr<LayerAnimationController> m_layerAnimationController;
 
     // Manages scrollbars for this layer
     scoped_ptr<ScrollbarAnimationController> m_scrollbarAnimationController;
 
     // Group of properties that need to be computed based on the layer tree
     // hierarchy before layers can be drawn.
     DrawProperties<LayerImpl, RenderSurfaceImpl> m_drawProperties;
 
     DISALLOW_COPY_AND_ASSIGN(LayerImpl);
 };
 
 }
 
 #endif  // CC_LAYER_IMPL_H_