| Index: cc/animation/scrollbar_animation_controller_thinning.h
|
| diff --git a/cc/animation/scrollbar_animation_controller_thinning.h b/cc/animation/scrollbar_animation_controller_thinning.h
|
| index c0c7a83e2eae8b7f6d513eddb1624126f5181ea5..e49f82fed4af6f753f538bf6f6634af651aac520 100644
|
| --- a/cc/animation/scrollbar_animation_controller_thinning.h
|
| +++ b/cc/animation/scrollbar_animation_controller_thinning.h
|
| @@ -21,6 +21,7 @@ class CC_EXPORT ScrollbarAnimationControllerThinning
|
| LayerImpl* scroll_layer,
|
| ScrollbarAnimationControllerClient* client,
|
| base::TimeDelta delay_before_starting,
|
| + base::TimeDelta resize_delay_before_starting,
|
| base::TimeDelta duration);
|
|
|
| virtual ~ScrollbarAnimationControllerThinning();
|
| @@ -31,7 +32,7 @@ class CC_EXPORT ScrollbarAnimationControllerThinning
|
| bool mouse_is_over_scrollbar() const { return mouse_is_over_scrollbar_; }
|
| bool mouse_is_near_scrollbar() const { return mouse_is_near_scrollbar_; }
|
|
|
| - virtual void DidScrollUpdate() OVERRIDE;
|
| + virtual void DidScrollUpdate(bool on_resize) OVERRIDE;
|
| virtual void DidMouseMoveOffScrollbar() OVERRIDE;
|
| virtual void DidMouseMoveNear(float distance) OVERRIDE;
|
|
|
| @@ -40,6 +41,7 @@ class CC_EXPORT ScrollbarAnimationControllerThinning
|
| LayerImpl* scroll_layer,
|
| ScrollbarAnimationControllerClient* client,
|
| base::TimeDelta delay_before_starting,
|
| + base::TimeDelta resize_delay_before_starting,
|
| base::TimeDelta duration);
|
|
|
| virtual void RunAnimationFrame(float progress) OVERRIDE;
|
|
|