| Index: cc/trees/layer_tree_host_impl.cc
|
| diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
|
| index 8c8c20512c40a8aeb2aa70f68f215c99fe8c06d9..4787eec4d97c1f2e015f1586ca8b55ab48ead685 100644
|
| --- a/cc/trees/layer_tree_host_impl.cc
|
| +++ b/cc/trees/layer_tree_host_impl.cc
|
| @@ -3643,7 +3643,7 @@ void LayerTreeHostImpl::ScrollAnimationAbort(LayerImpl* layer_impl) {
|
| return animation_host_->ScrollAnimationAbort();
|
|
|
| layer_impl->layer_animation_controller()->AbortAnimations(
|
| - Animation::SCROLL_OFFSET);
|
| + AnimationTargetProperty::SCROLL_OFFSET);
|
| }
|
|
|
| void LayerTreeHostImpl::ScrollAnimationCreate(
|
| @@ -3662,7 +3662,8 @@ void LayerTreeHostImpl::ScrollAnimationCreate(
|
|
|
| scoped_ptr<Animation> animation = Animation::Create(
|
| std::move(curve), AnimationIdProvider::NextAnimationId(),
|
| - AnimationIdProvider::NextGroupId(), Animation::SCROLL_OFFSET);
|
| + AnimationIdProvider::NextGroupId(),
|
| + AnimationTargetProperty::SCROLL_OFFSET);
|
| animation->set_is_impl_only(true);
|
|
|
| layer_impl->layer_animation_controller()->AddAnimation(std::move(animation));
|
| @@ -3679,7 +3680,7 @@ bool LayerTreeHostImpl::ScrollAnimationUpdateTarget(
|
| Animation* animation =
|
| layer_impl->layer_animation_controller()
|
| ? layer_impl->layer_animation_controller()->GetAnimation(
|
| - Animation::SCROLL_OFFSET)
|
| + AnimationTargetProperty::SCROLL_OFFSET)
|
| : nullptr;
|
| if (!animation)
|
| return false;
|
|
|