Prevent overlay scrollbars expand or hover together

cc/input/scrollbar_animation_controller.h

 // Copyright 2012 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_H_
 #define CC_INPUT_SCROLLBAR_ANIMATION_CONTROLLER_H_
 
 #include "base/cancelable_callback.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
@@ skipping 19 matching lines @@
   virtual ~ScrollbarAnimationControllerClient() {}
 };
 
 // This abstract class represents the compositor-side analogy of
 // ScrollbarAnimator.  Individual platforms should subclass it to provide
 // specialized implementation.
 class CC_EXPORT ScrollbarAnimationController {
  public:
   virtual ~ScrollbarAnimationController();
 
-  bool Animate(base::TimeTicks now);
+  virtual bool Animate(base::TimeTicks now);
 
   virtual void DidScrollBegin();
   virtual void DidScrollUpdate(bool on_resize);
   virtual void DidScrollEnd();
   virtual void DidMouseDown() {}
   virtual void DidMouseUp() {}
   virtual void DidMouseLeave() {}
-  virtual void DidMouseMoveNear(float distance) {}
+  virtual void DidMouseMoveNear(ScrollbarOrientation, float) {}
   virtual bool ScrollbarsHidden() const;
 
  protected:
   ScrollbarAnimationController(int scroll_layer_id,
                                ScrollbarAnimationControllerClient* client,
                                base::TimeDelta delay_before_starting,
                                base::TimeDelta resize_delay_before_starting);
 
   virtual void RunAnimationFrame(float progress) = 0;
   virtual const base::TimeDelta& Duration() = 0;
 
   void StartAnimation();
   void StopAnimation();
+

[bokan, 2017/01/20 18:57:25]

Nit: remove new line

   ScrollbarSet Scrollbars() const;
 
   ScrollbarAnimationControllerClient* client_;
 
   void PostDelayedAnimationTask(bool on_resize);
 
   int scroll_layer_id() const { return scroll_layer_id_; }
 
+  bool animating_fade() const { return is_animating_; }
+
  private:
   // Returns how far through the animation we are as a progress value from
   // 0 to 1.
   float AnimationProgressAtTime(base::TimeTicks now);
 
   base::TimeTicks last_awaken_time_;
   base::TimeDelta delay_before_starting_;
   base::TimeDelta resize_delay_before_starting_;
 
   bool is_animating_;
 
   int scroll_layer_id_;
   bool currently_scrolling_;
   bool scroll_gesture_has_scrolled_;
   base::CancelableClosure delayed_scrollbar_fade_;
 
   base::WeakPtrFactory<ScrollbarAnimationController> weak_factory_;
 };
 
 }  // namespace cc
 
 #endif  // CC_INPUT_SCROLLBAR_ANIMATION_CONTROLLER_H_