Call delay_show Cancel in ScrollbarAnimationControlller::Show

cc/input/scrollbar_animation_controller.cc

 // Copyright 2014 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.
 
 #include "cc/input/scrollbar_animation_controller.h"
 
 #include <algorithm>
 
 #include "base/time/time.h"
 #include "cc/trees/layer_tree_impl.h"
@@ skipping 225 matching lines @@
     PostDelayedFadeOut(false);
 }
 
 void ScrollbarAnimationController::DidMouseLeave() {
   if (!need_thinning_animation_)
     return;
 
   vertical_controller_->DidMouseLeave();
   horizontal_controller_->DidMouseLeave();
 
+  delayed_scrollbar_show_.Cancel();
+
   if (ScrollbarsHidden() || Captured())
     return;
 
   PostDelayedFadeOut(false);
 }
 
 void ScrollbarAnimationController::DidMouseMoveNear(
     ScrollbarOrientation orientation,
     float distance) {
   if (!need_thinning_animation_)
@@ skipping 69 matching lines @@
 bool ScrollbarAnimationController::ScrollbarsHidden() const {
   return opacity_ == 0.0f;
 }
 
 bool ScrollbarAnimationController::Captured() const {
   DCHECK(need_thinning_animation_);
   return vertical_controller_->captured() || horizontal_controller_->captured();
 }
 
 void ScrollbarAnimationController::Show() {
+  delayed_scrollbar_show_.Cancel();
   ApplyOpacityToScrollbars(1.0f);
 }
 
 void ScrollbarAnimationController::ApplyOpacityToScrollbars(float opacity) {
   for (ScrollbarLayerImplBase* scrollbar : Scrollbars()) {
     if (!scrollbar->is_overlay_scrollbar())
       continue;
     float effective_opacity = scrollbar->CanScrollOrientation() ? opacity : 0;
     PropertyTrees* property_trees =
         scrollbar->layer_tree_impl()->property_trees();
@@ skipping 14 matching lines @@
   bool previouslyVisible = opacity_ > 0.0f;
   bool currentlyVisible = opacity > 0.0f;
 
   opacity_ = opacity;
 
   if (previouslyVisible != currentlyVisible)
     client_->DidChangeScrollbarVisibility();
 }
 
 }  // namespace cc