| Index: cc/layers/layer_impl.cc
|
| diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
|
| index 34334b19ca84c6b7dfaa8b8beb7e344b3e5346e0..2d5f449a8ba322d47bfed875fb18a9140e404669 100644
|
| --- a/cc/layers/layer_impl.cc
|
| +++ b/cc/layers/layer_impl.cc
|
| @@ -63,7 +63,7 @@ LayerImpl::LayerImpl(LayerTreeImpl* tree_impl, int id)
|
| AnimationRegistrar* registrar = layer_tree_impl_->animationRegistrar();
|
| layer_animation_controller_ =
|
| registrar->GetAnimationControllerForId(layer_id_);
|
| - layer_animation_controller_->AddObserver(this);
|
| + layer_animation_controller_->AddValueObserver(this);
|
| }
|
|
|
| LayerImpl::~LayerImpl() {
|
| @@ -71,7 +71,7 @@ LayerImpl::~LayerImpl() {
|
| DCHECK(!between_will_draw_and_did_draw_);
|
| #endif
|
| layer_tree_impl_->UnregisterLayer(this);
|
| - layer_animation_controller_->RemoveObserver(this);
|
| + layer_animation_controller_->RemoveValueObserver(this);
|
| }
|
|
|
| void LayerImpl::AddChild(scoped_ptr<LayerImpl> child) {
|
| @@ -363,9 +363,6 @@ void LayerImpl::PushPropertiesTo(LayerImpl* layer) {
|
|
|
| layer->SetStackingOrderChanged(stacking_order_changed_);
|
|
|
| - layer_animation_controller_->PushAnimationUpdatesTo(
|
| - layer->layer_animation_controller());
|
| -
|
| // Reset any state that should be cleared for the next update.
|
| stacking_order_changed_ = false;
|
| update_rect_ = gfx::RectF();
|
|
|