Index: cc/animation/scrollbar_animation_controller_linear_fade.h |
diff --git a/cc/animation/scrollbar_animation_controller_linear_fade.h b/cc/animation/scrollbar_animation_controller_linear_fade.h |
index 107004997849b7e11b7fab062a113a854269c217..12041ce1052d449377eac3f590437f935b8ac6a8 100644 |
--- a/cc/animation/scrollbar_animation_controller_linear_fade.h |
+++ b/cc/animation/scrollbar_animation_controller_linear_fade.h |
@@ -19,17 +19,19 @@ class CC_EXPORT ScrollbarAnimationControllerLinearFade |
LayerImpl* scroll_layer, |
ScrollbarAnimationControllerClient* client, |
base::TimeDelta delay_before_starting, |
+ base::TimeDelta resize_delay_before_starting, |
base::TimeDelta duration); |
virtual ~ScrollbarAnimationControllerLinearFade(); |
- virtual void DidScrollUpdate() OVERRIDE; |
+ virtual void DidScrollUpdate(bool on_resize = false) OVERRIDE; |
aelias_OOO_until_Jul13
2014/09/30 18:55:27
Default arguments are against the Chromium style g
MuVen
2014/10/01 16:45:51
Done.
|
protected: |
ScrollbarAnimationControllerLinearFade( |
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; |