| Index: cc/animation/animation_player.h
|
| diff --git a/cc/animation/animation_player.h b/cc/animation/animation_player.h
|
| index 7d04c5655012fee8d62698a348a1aa950370c0bf..97883acde42a756e5edd538422fa77402475986c 100644
|
| --- a/cc/animation/animation_player.h
|
| +++ b/cc/animation/animation_player.h
|
| @@ -69,19 +69,19 @@ class CC_EXPORT AnimationPlayer : public base::RefCounted<AnimationPlayer>,
|
| void PauseAnimation(int animation_id, double time_offset);
|
| void RemoveAnimation(int animation_id);
|
| void AbortAnimation(int animation_id);
|
| - void AbortAnimations(Animation::TargetProperty target_property);
|
| + void AbortAnimations(TargetProperty::Type target_property);
|
|
|
| void PushPropertiesTo(AnimationPlayer* player_impl);
|
|
|
| // AnimationDelegate routing.
|
| void NotifyAnimationStarted(base::TimeTicks monotonic_time,
|
| - Animation::TargetProperty target_property,
|
| + TargetProperty::Type target_property,
|
| int group);
|
| void NotifyAnimationFinished(base::TimeTicks monotonic_time,
|
| - Animation::TargetProperty target_property,
|
| + TargetProperty::Type target_property,
|
| int group);
|
| void NotifyAnimationAborted(base::TimeTicks monotonic_time,
|
| - Animation::TargetProperty target_property,
|
| + TargetProperty::Type target_property,
|
| int group);
|
|
|
| // Whether this player has animations waiting to get sent to LAC.
|
|
|