| Index: cc/animation/animation_player.cc
|
| diff --git a/cc/animation/animation_player.cc b/cc/animation/animation_player.cc
|
| index 52fa9a8dec724711a6d7d1df482da7341fc452f8..ae251a967f90576b6733bcbcb04f2a46e842d0ab 100644
|
| --- a/cc/animation/animation_player.cc
|
| +++ b/cc/animation/animation_player.cc
|
| @@ -119,7 +119,8 @@ void AnimationPlayer::UnbindElementAnimations() {
|
| }
|
|
|
| void AnimationPlayer::AddAnimation(scoped_ptr<Animation> animation) {
|
| - DCHECK(animation->target_property() != Animation::SCROLL_OFFSET ||
|
| + DCHECK(animation->target_property() !=
|
| + AnimationTargetProperty::SCROLL_OFFSET ||
|
| (animation_host_ && animation_host_->SupportsScrollAnimations()));
|
|
|
| if (element_animations_) {
|
| @@ -161,7 +162,7 @@ void AnimationPlayer::AbortAnimation(int animation_id) {
|
| }
|
|
|
| void AnimationPlayer::AbortAnimations(
|
| - Animation::TargetProperty target_property) {
|
| + AnimationTargetProperty::Enum target_property) {
|
| if (element_animations_) {
|
| element_animations_->layer_animation_controller()->AbortAnimations(
|
| target_property);
|
| @@ -187,7 +188,7 @@ void AnimationPlayer::PushPropertiesTo(AnimationPlayer* player_impl) {
|
|
|
| void AnimationPlayer::NotifyAnimationStarted(
|
| base::TimeTicks monotonic_time,
|
| - Animation::TargetProperty target_property,
|
| + AnimationTargetProperty::Enum target_property,
|
| int group) {
|
| if (layer_animation_delegate_)
|
| layer_animation_delegate_->NotifyAnimationStarted(monotonic_time,
|
| @@ -196,7 +197,7 @@ void AnimationPlayer::NotifyAnimationStarted(
|
|
|
| void AnimationPlayer::NotifyAnimationFinished(
|
| base::TimeTicks monotonic_time,
|
| - Animation::TargetProperty target_property,
|
| + AnimationTargetProperty::Enum target_property,
|
| int group) {
|
| if (layer_animation_delegate_)
|
| layer_animation_delegate_->NotifyAnimationFinished(monotonic_time,
|
| @@ -205,7 +206,7 @@ void AnimationPlayer::NotifyAnimationFinished(
|
|
|
| void AnimationPlayer::NotifyAnimationAborted(
|
| base::TimeTicks monotonic_time,
|
| - Animation::TargetProperty target_property,
|
| + AnimationTargetProperty::Enum target_property,
|
| int group) {
|
| if (layer_animation_delegate_)
|
| layer_animation_delegate_->NotifyAnimationAborted(monotonic_time,
|
|
|