| Index: cc/layers/layer.h
|
| diff --git a/cc/layers/layer.h b/cc/layers/layer.h
|
| index 99f85c12770662dde067490bb6c76e05a18d81e7..672b249668a04b50c8c834f0cbbf08679fbc0ae7 100644
|
| --- a/cc/layers/layer.h
|
| +++ b/cc/layers/layer.h
|
| @@ -559,12 +559,9 @@ class CC_EXPORT Layer : public base::RefCounted<Layer> {
|
| void OnOpacityAnimated(float opacity);
|
| void OnTransformAnimated(const gfx::Transform& transform);
|
| void OnScrollOffsetAnimated(const gfx::ScrollOffset& scroll_offset);
|
| - void OnTransformIsCurrentlyAnimatingChanged(bool is_animating);
|
| - void OnTransformIsPotentiallyAnimatingChanged(bool is_animating);
|
| - void OnOpacityIsCurrentlyAnimatingChanged(bool is_currently_animating);
|
| - void OnOpacityIsPotentiallyAnimatingChanged(bool has_potential_animation);
|
| - void OnFilterIsCurrentlyAnimatingChanged(bool is_currently_animating);
|
| - void OnFilterIsPotentiallyAnimatingChanged(bool has_potential_animation);
|
| +
|
| + void OnIsAnimatingChanged(const PropertyAnimationState& mask,
|
| + const PropertyAnimationState& state);
|
|
|
| bool FilterIsAnimating() const;
|
| bool TransformIsAnimating() const;
|
|
|