| Index: cc/layers/layer_impl.h
|
| diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h
|
| index 02e64f4eb50f0181e2464729c238ab8b2993de2d..88461818a5b70f83f006963fd4b6f8ae0d8c1073 100644
|
| --- a/cc/layers/layer_impl.h
|
| +++ b/cc/layers/layer_impl.h
|
| @@ -119,13 +119,13 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
|
|
|
| // AnimationDelegate implementation.
|
| void NotifyAnimationStarted(base::TimeTicks monotonic_time,
|
| - Animation::TargetProperty target_property,
|
| + AnimationTargetProperty target_property,
|
| int group) override{};
|
| void NotifyAnimationFinished(base::TimeTicks monotonic_time,
|
| - Animation::TargetProperty target_property,
|
| + AnimationTargetProperty target_property,
|
| int group) override;
|
| void NotifyAnimationAborted(base::TimeTicks monotonic_time,
|
| - Animation::TargetProperty target_property,
|
| + AnimationTargetProperty target_property,
|
| int group) override{};
|
|
|
| // Tree structure.
|
| @@ -554,8 +554,7 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
|
|
|
| // This includes all animations, even those that are finished but haven't yet
|
| // been deleted.
|
| - bool HasAnyAnimationTargetingProperty(
|
| - Animation::TargetProperty property) const;
|
| + bool HasAnyAnimationTargetingProperty(AnimationTargetProperty property) const;
|
|
|
| bool HasFilterAnimationThatInflatesBounds() const;
|
| bool HasTransformAnimationThatInflatesBounds() const;
|
|
|