Revert 171714 - 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 "base/values.h"
 #include "cc/debug_border_draw_quad.h"
@@ skipping 20 matching lines @@
     , m_contentsScaleY(1.0)
     , m_scrollable(false)
     , m_shouldScrollOnMainThread(false)
     , m_haveWheelEventHandlers(false)
     , m_backgroundColor(0)
     , m_doubleSided(true)
     , m_layerPropertyChanged(false)
     , m_layerSurfacePropertyChanged(false)
     , m_masksToBounds(false)
     , m_contentsOpaque(false)
+    , m_opacity(1.0)
     , m_preserves3D(false)
     , m_useParentBackfaceVisibility(false)
     , m_drawCheckerboardForMissingTiles(false)
     , m_useLCDText(false)
     , m_drawsContent(false)
     , m_forceRenderSurface(false)
     , m_isContainerForFixedPositionLayers(false)
     , m_fixedToContainerLayer(false)
     , m_drawDepth(0)
 #ifndef NDEBUG
     , m_betweenWillDrawAndDidDraw(false)
 #endif
-    , m_layerAnimationController(LayerAnimationController::create())
+    , m_layerAnimationController(LayerAnimationController::create(this))
 {
     DCHECK(m_layerId > 0);
     DCHECK(m_layerTreeHostImpl);
-    m_layerAnimationController->setId(m_layerId);
-    m_layerAnimationController->setAnimationRegistrar(hostImpl);
 }
 
 LayerImpl::~LayerImpl()
 {
 #ifndef NDEBUG
     DCHECK(!m_betweenWillDrawAndDidDraw);
 #endif
 }
 
 void LayerImpl::addChild(scoped_ptr<LayerImpl> child)
@@ skipping 376 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 @@
 {
     if (m_contentsOpaque == opaque)
         return;
 
     m_contentsOpaque = opaque;
     noteLayerPropertyChangedForSubtree();
 }
 
 void LayerImpl::setOpacity(float opacity)
 {
-    if (!m_layerAnimationController->setOpacity(opacity))
+    if (m_opacity == opacity)
         return;
+
+    m_opacity = opacity;
     m_layerSurfacePropertyChanged = true;
 }
 
-float LayerImpl::opacity() const
-{
-    return m_layerAnimationController->opacity();
-}
-
 bool LayerImpl::opacityIsAnimating() const
 {
     return m_layerAnimationController->isAnimatingProperty(ActiveAnimation::Opacity);
 }
 
 void LayerImpl::setPosition(const gfx::PointF& position)
 {
     if (m_position == position)
         return;
 
@@ skipping 15 matching lines @@
     if (m_sublayerTransform == sublayerTransform)
         return;
 
     m_sublayerTransform = sublayerTransform;
     // sublayer transform does not affect the current layer; it affects only its children.
     noteLayerPropertyChangedForDescendants();
 }
 
 void LayerImpl::setTransform(const gfx::Transform& transform)
 {
-    if (!m_layerAnimationController->setTransform(transform))
+    if (m_transform == transform)
         return;
+
+    m_transform = transform;
     m_layerSurfacePropertyChanged = true;
 }
 
-const gfx::Transform& LayerImpl::transform() const
-{
-    return m_layerAnimationController->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