Use an auxiliary list of animation controllers.

cc/layer_impl.h

Index: cc/layer_impl.h
diff --git a/cc/layer_impl.h b/cc/layer_impl.h
index ce22ed6f5b52e5c7a4da3a17fe0c08df52fb5599..0e8800214fd6962bcae7c296de6df7fc447e79a8 100644
--- a/cc/layer_impl.h
+++ b/cc/layer_impl.h
@@ -38,7 +38,7 @@ class Layer;
 
 struct AppendQuadsData;
 
-class CC_EXPORT LayerImpl : public LayerAnimationControllerClient {
+class CC_EXPORT LayerImpl {
 public:
     typedef ScopedPtrVector<LayerImpl> LayerList;
 
@@ -49,12 +49,7 @@ public:
 
     virtual ~LayerImpl();
 
-    // 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;
+    int id() const;
 
     // Tree structure.
     LayerImpl* parent() { return m_parent; }
@@ -77,7 +72,7 @@ public:
     bool replicaHasMask() const { return m_replicaLayer && (m_maskLayer || m_replicaLayer->m_maskLayer); }
 
     LayerTreeHostImpl* layerTreeHostImpl() const { return m_layerTreeHostImpl; }
-    void setLayerTreeHostImpl(LayerTreeHostImpl* hostImpl) { m_layerTreeHostImpl = hostImpl; }
+    void setLayerTreeHostImpl(LayerTreeHostImpl* hostImpl);
 
     scoped_ptr<SharedQuadState> createSharedQuadState() const;
     // willDraw must be called before appendQuads. If willDraw is called,
@@ -131,6 +126,7 @@ public:
     bool contentsOpaque() const { return m_contentsOpaque; }
 
     void setOpacity(float);
+    float opacity() const;
     bool opacityIsAnimating() const;
 
     void setPosition(const gfx::PointF&);
@@ -235,6 +231,7 @@ public:
     void setDoubleSided(bool);
 
     void setTransform(const gfx::Transform&);
+    const gfx::Transform& transform() const;
     bool transformIsAnimating() const;
 
     const gfx::Transform& drawTransform() const { return m_drawTransform; }
@@ -360,13 +357,11 @@ private:
     gfx::Rect m_visibleContentRect;
     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;
@@ -426,7 +421,7 @@ private:
     gfx::RectF m_updateRect;
 
     // Manages animations for this layer.
-    scoped_ptr<LayerAnimationController> m_layerAnimationController;
+    scoped_refptr<LayerAnimationController> m_layerAnimationController;
 
     // Manages scrollbars for this layer
     scoped_ptr<ScrollbarAnimationController> m_scrollbarAnimationController;