Use an auxiliary list of animation controllers.

cc/layer_impl.cc

 // 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.
 
 #include "cc/layer_impl.h"
 
 #include "base/debug/trace_event.h"
 #include "base/stringprintf.h"
 #include "cc/debug_border_draw_quad.h"
 #include "cc/debug_colors.h"
@@ skipping 41 matching lines @@
     , m_drawDepth(0)
     , m_drawOpacity(0)
     , m_drawOpacityIsAnimating(false)
     , m_filter(0)
     , m_drawTransformIsAnimating(false)
     , m_screenSpaceTransformIsAnimating(false)
     , m_isClipped(false)
 #ifndef NDEBUG
     , m_betweenWillDrawAndDidDraw(false)
 #endif
-    , m_layerAnimationController(LayerAnimationController::create(this))
+    , m_layerAnimationController(LayerAnimationController::create())
 {
     DCHECK(m_layerId > 0);
+    m_layerAnimationController->setId(m_layerId);
 }
 
 LayerImpl::~LayerImpl()
 {
 #ifndef NDEBUG
     DCHECK(!m_betweenWillDrawAndDidDraw);
 #endif
     SkSafeUnref(m_filter);
 }
 
@@ skipping 39 matching lines @@
 
 bool LayerImpl::descendantDrawsContent()
 {
     for (size_t i = 0; i < m_children.size(); ++i) {
         if (m_children[i]->drawsContent() || m_children[i]->descendantDrawsContent())
             return true;
     }
     return false;
 }
 
+void LayerImpl::setLayerTreeHostImpl(LayerTreeHostImpl* hostImpl)
+{
+    m_layerTreeHostImpl = hostImpl;
+    m_layerAnimationController->setAnimationRegistrar(hostImpl);
+}
+
 scoped_ptr<SharedQuadState> LayerImpl::createSharedQuadState() const
 {
   scoped_ptr<SharedQuadState> state = SharedQuadState::Create();
   state->SetAll(m_drawTransform, m_visibleContentRect, m_drawableContentRect, m_clipRect, m_isClipped, m_drawOpacity);
   return state.Pass();
 }
 
 void LayerImpl::willDraw(ResourceProvider*)
 {
 #ifndef NDEBUG
@@ skipping 280 matching lines @@
 bool LayerImpl::layerIsAlwaysDamaged() const
 {
     return false;
 }
 
 int LayerImpl::id() const
 {
      return m_layerId;
 }
 
-float LayerImpl::opacity() const
-{
-     return m_opacity;
-}
-
-void LayerImpl::setOpacityFromAnimation(float opacity)
-{
-    setOpacity(opacity);
-}
-
-const gfx::Transform& LayerImpl::transform() const
-{
-     return m_transform;
-}
-
-void LayerImpl::setTransformFromAnimation(const gfx::Transform& transform)
-{
-    setTransform(transform);
-}
-
 void LayerImpl::setBounds(const gfx::Size& bounds)
 {
     if (m_bounds == bounds)
         return;
 
     m_bounds = bounds;
 
     if (masksToBounds())
         noteLayerPropertyChangedForSubtree();
     else
@@ skipping 106 matching lines @@
     m_contentsOpaque = opaque;
     noteLayerPropertyChangedForSubtree();
 }
 
 void LayerImpl::setOpacity(float opacity)
 {
     if (m_opacity == opacity)
         return;
 
     m_opacity = opacity;
+    m_opacityLastUpdateTime = base::TimeTicks::Now();
     m_layerSurfacePropertyChanged = true;
 }
 
+float LayerImpl::opacity() const
+{
+    if (m_layerAnimationController->opacityLastUpdateTime() > m_opacityLastUpdateTime)
+        return m_layerAnimationController->opacity();
+    return m_opacity;
+}
+
 bool LayerImpl::opacityIsAnimating() const
 {
     return m_layerAnimationController->isAnimatingProperty(ActiveAnimation::Opacity);
 }
 
 void LayerImpl::setPosition(const gfx::PointF& position)
 {
     if (m_position == position)
         return;
 
@@ skipping 19 matching lines @@
     // sublayer transform does not affect the current layer; it affects only its children.
     noteLayerPropertyChangedForDescendants();
 }
 
 void LayerImpl::setTransform(const gfx::Transform& transform)
 {
     if (m_transform == transform)
         return;
 
     m_transform = transform;
+    m_transformLastUpdateTime = base::TimeTicks::Now();
     m_layerSurfacePropertyChanged = true;
 }
 
+const gfx::Transform& LayerImpl::transform() const
+{
+    if (m_layerAnimationController->transformLastUpdateTime() > m_transformLastUpdateTime)
+        return m_layerAnimationController->transform();
+    return m_transform;
+}
+
 bool LayerImpl::transformIsAnimating() const
 {
     return m_layerAnimationController->isAnimatingProperty(ActiveAnimation::Transform);
 }
 
 void LayerImpl::setContentBounds(const gfx::Size& contentBounds)
 {
     if (m_contentBounds == contentBounds)
         return;
 
@@ skipping 97 matching lines @@
 
 void LayerImpl::setVerticalScrollbarLayer(ScrollbarLayerImpl* scrollbarLayer)
 {
     if (!m_scrollbarAnimationController)
         m_scrollbarAnimationController = ScrollbarAnimationController::create(this);
     m_scrollbarAnimationController->setVerticalScrollbarLayer(scrollbarLayer);
     m_scrollbarAnimationController->updateScrollOffset(this);
 }
 
 }  // namespace cc