| Index: cc/input/scrollbar_animation_controller.cc
|
| diff --git a/cc/input/scrollbar_animation_controller.cc b/cc/input/scrollbar_animation_controller.cc
|
| index cde87abc19f53720c9e4ef50b025b1ca6cc1fa29..4906ef4737db1921018b018ad1b8243652714805 100644
|
| --- a/cc/input/scrollbar_animation_controller.cc
|
| +++ b/cc/input/scrollbar_animation_controller.cc
|
| @@ -243,6 +243,8 @@ void ScrollbarAnimationController::DidMouseLeave() {
|
| vertical_controller_->DidMouseLeave();
|
| horizontal_controller_->DidMouseLeave();
|
|
|
| + delayed_scrollbar_show_.Cancel();
|
| +
|
| if (ScrollbarsHidden() || Captured())
|
| return;
|
|
|
| @@ -332,6 +334,7 @@ bool ScrollbarAnimationController::Captured() const {
|
| }
|
|
|
| void ScrollbarAnimationController::Show() {
|
| + delayed_scrollbar_show_.Cancel();
|
| ApplyOpacityToScrollbars(1.0f);
|
| }
|
|
|
|
|