Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / cc / animation / scrollbar_animation_controller_thinning.h

diff --git a/src/cc/animation/scrollbar_animation_controller_thinning.h b/src/cc/animation/scrollbar_animation_controller_thinning.h
index c0c7a83..2cf30f5 100644 (file)
--- a/src/cc/animation/scrollbar_animation_controller_thinning.h
+++ b/src/cc/animation/scrollbar_animation_controller_thinning.h
@@ -21,9 +21,10 @@ 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();
+  ~ScrollbarAnimationControllerThinning() override;
 
   void set_mouse_move_distance_for_test(float distance) {
     mouse_move_distance_to_trigger_animation_ = distance;
@@ -31,18 +32,19 @@ 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 DidMouseMoveOffScrollbar() OVERRIDE;
-  virtual void DidMouseMoveNear(float distance) OVERRIDE;
+  void DidScrollUpdate(bool on_resize) override;
+  void DidMouseMoveOffScrollbar() override;
+  void DidMouseMoveNear(float distance) override;
 
  protected:
   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;
+  void RunAnimationFrame(float progress) override;
 
  private:
   // Describes whether the current animation should INCREASE (darken / thicken)