Chromium Code Reviews| Index: cc/animation/scrollbar_animation_controller.h |
| diff --git a/cc/animation/scrollbar_animation_controller.h b/cc/animation/scrollbar_animation_controller.h |
| index ad7f631bb9ef12877b5a7945672c1a1c44a4fcba..a245eb2e33d24e72e2af16f91db718fe32e617bf 100644 |
| --- a/cc/animation/scrollbar_animation_controller.h |
| +++ b/cc/animation/scrollbar_animation_controller.h |
| @@ -32,7 +32,7 @@ class CC_EXPORT ScrollbarAnimationController { |
| void Animate(base::TimeTicks now); |
| virtual void DidScrollBegin(); |
| - virtual void DidScrollUpdate(); |
| + virtual void DidScrollUpdate(bool on_resize = false); |
|
aelias_OOO_until_Jul13
2014/09/30 18:55:27
Please remove this default argument.
MuVen
2014/10/01 16:45:51
Done.
|
| virtual void DidScrollEnd(); |
| virtual void DidMouseMoveOffScrollbar() {} |
| virtual void DidMouseMoveNear(float distance) {} |
| @@ -40,6 +40,7 @@ class CC_EXPORT ScrollbarAnimationController { |
| protected: |
| ScrollbarAnimationController(ScrollbarAnimationControllerClient* client, |
| base::TimeDelta delay_before_starting, |
| + base::TimeDelta resize_delay_before_starting, |
| base::TimeDelta duration); |
| virtual void RunAnimationFrame(float progress) = 0; |
| @@ -52,11 +53,12 @@ class CC_EXPORT ScrollbarAnimationController { |
| // 0 to 1. |
| float AnimationProgressAtTime(base::TimeTicks now); |
| - void PostDelayedFade(); |
| + void PostDelayedFade(bool on_resize = false); |
|
aelias_OOO_until_Jul13
2014/09/30 18:55:27
Please remove this default argument.
MuVen
2014/10/01 16:45:51
Done.
|
| ScrollbarAnimationControllerClient* client_; |
| base::TimeTicks last_awaken_time_; |
| base::TimeDelta delay_before_starting_; |
| + base::TimeDelta resize_delay_before_starting_; |
| base::TimeDelta duration_; |
| bool is_animating_; |