| Index: cc/layers/layer_impl.cc
|
| diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
|
| index a5ae0607ff6bbce62557f1410883141a66062a6b..7a23e6618a9dd8dba589f35c5e2e9f08a56e2d31 100644
|
| --- a/cc/layers/layer_impl.cc
|
| +++ b/cc/layers/layer_impl.cc
|
| @@ -75,8 +75,10 @@ LayerImpl::LayerImpl(LayerTreeImpl* tree_impl, int id)
|
| layer_animation_controller_ =
|
| registrar->GetAnimationControllerForId(layer_id_);
|
| layer_animation_controller_->AddValueObserver(this);
|
| - if (IsActive())
|
| + if (IsActive()) {
|
| layer_animation_controller_->set_value_provider(this);
|
| + layer_animation_controller_->set_layer_animation_delegate(this);
|
| + }
|
| SetNeedsPushProperties();
|
| }
|
|
|
| @@ -85,6 +87,7 @@ LayerImpl::~LayerImpl() {
|
|
|
| layer_animation_controller_->RemoveValueObserver(this);
|
| layer_animation_controller_->remove_value_provider(this);
|
| + layer_animation_controller_->remove_layer_animation_delegate(this);
|
|
|
| if (!copy_requests_.empty() && layer_tree_impl_->IsActiveTree())
|
| layer_tree_impl()->RemoveLayerWithCopyOutputRequest(this);
|
| @@ -1491,4 +1494,12 @@ scoped_ptr<base::Value> LayerImpl::AsValue() const {
|
| void LayerImpl::RunMicroBenchmark(MicroBenchmarkImpl* benchmark) {
|
| benchmark->RunOnLayer(this);
|
| }
|
| +
|
| +void LayerImpl::NotifyAnimationFinished(
|
| + base::TimeTicks monotonic_time,
|
| + Animation::TargetProperty target_property) {
|
| + if (target_property == Animation::ScrollOffset)
|
| + layer_tree_impl_->InputScrollAnimationFinished();
|
| +}
|
| +
|
| } // namespace cc
|
|
|