Prevent overlay scrollbars expand or hover together

cc/input/scrollbar_animation_controller_thinning.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_INPUT_SCROLLBAR_ANIMATION_CONTROLLER_THINNING_H_
 #define CC_INPUT_SCROLLBAR_ANIMATION_CONTROLLER_THINNING_H_
 
+#include <algorithm>
 #include <memory>
+#include <vector>
 
 #include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/input/scrollbar_animation_controller.h"
+#include "cc/input/single_scrollbar_animation_controller_thinning.h"
 
 namespace cc {
 
+using std::vector;
+using std::unique_ptr;
+
 // Scrollbar animation that partially fades and thins after an idle delay,
 // and reacts to mouse movements.
 class CC_EXPORT ScrollbarAnimationControllerThinning
     : public ScrollbarAnimationController {
  public:
-  static std::unique_ptr<ScrollbarAnimationControllerThinning> Create(
+  static unique_ptr<ScrollbarAnimationControllerThinning> Create(
       int scroll_layer_id,
       ScrollbarAnimationControllerClient* client,
       base::TimeDelta delay_before_starting,
       base::TimeDelta resize_delay_before_starting,
       base::TimeDelta fade_duration,
       base::TimeDelta thinning_duration);
 
   ~ScrollbarAnimationControllerThinning() override;
 
-  void set_mouse_move_distance_for_test(float distance) {
-    mouse_move_distance_to_trigger_animation_ = distance;
-  }
-  bool mouse_is_over_scrollbar() const { return mouse_is_over_scrollbar_; }
-  bool mouse_is_near_scrollbar() const { return mouse_is_near_scrollbar_; }
+  void set_mouse_move_distance_for_test(float distance);
 
+  bool mouse_is_over_scrollbar(ScrollbarOrientation orientation) const;
+  bool mouse_is_near_scrollbar(ScrollbarOrientation orientation) const;
+  bool ScrollbarsHidden() const override;
+
+  bool Animate(base::TimeTicks now) override;
   void DidScrollUpdate(bool on_resize) override;
-
   void DidMouseDown() override;
   void DidMouseUp() override;
   void DidMouseLeave() override;
-  void DidMouseMoveNear(float distance) override;
-  bool ScrollbarsHidden() const override;
+  void DidMouseMoveNear(vector<DistanceToScrollbar>) override;
 
  protected:
   ScrollbarAnimationControllerThinning(
       int scroll_layer_id,
       ScrollbarAnimationControllerClient* client,
       base::TimeDelta delay_before_starting,
       base::TimeDelta resize_delay_before_starting,
       base::TimeDelta fade_duration,
       base::TimeDelta thinning_duration);
 
   void RunAnimationFrame(float progress) override;
   const base::TimeDelta& Duration() override;
 
  private:
-  // Describes whether the current animation should INCREASE (thicken)
-  // a bar or DECREASE it (thin).
-  enum AnimationChange { NONE, INCREASE, DECREASE };
-  enum AnimatingProperty { OPACITY, THICKNESS };
-  float ThumbThicknessScaleAt(float progress);
-  float AdjustScale(float new_value,
-                    float current_value,
-                    AnimationChange animation_change,
-                    float min_value,
-                    float max_value);
-  void ApplyOpacity(float opacity);
-  void ApplyThumbThicknessScale(float thumb_thickness_scale);
+  vector<unique_ptr<SingleScrollbarAnimationControllerThinning>>

[bokan, 2016/12/06 19:44:46]

I think it would be simpler just to have two
unique_ptr<SingleScrollbarAnimationControllerThinning> m_horizontal... and
m_vertical...

+      scrollbar_controllers;
 
-  void SetCurrentAnimatingProperty(AnimatingProperty property);
-
-  float opacity_;
-  bool captured_;
-  bool mouse_is_over_scrollbar_;
-  bool mouse_is_near_scrollbar_;
-  // Are we narrowing or thickening the bars.
-  AnimationChange thickness_change_;
-  // How close should the mouse be to the scrollbar before we thicken it.
-  float mouse_move_distance_to_trigger_animation_;
-
-  base::TimeDelta fade_duration_;
-  base::TimeDelta thinning_duration_;
-
-  AnimatingProperty current_animating_property_;
+  void GetScrollbarAnimationController(
+      ScrollbarOrientation orientation,
+      SingleScrollbarAnimationControllerThinning* scrollbar_controller) const;
 
   DISALLOW_COPY_AND_ASSIGN(ScrollbarAnimationControllerThinning);
 };
 
 }  // namespace cc
 
 #endif  // CC_INPUT_SCROLLBAR_ANIMATION_CONTROLLER_THINNING_H_