Index: content/browser/web_contents/aura/overscroll_window_animation.cc |
diff --git a/content/browser/web_contents/aura/overscroll_window_animation.cc b/content/browser/web_contents/aura/overscroll_window_animation.cc |
index 8ed863772f022b4b5f1e2d54008bbda2fc691bef..8c3b0bb123573a12360114267a0a861947d37e34 100644 |
--- a/content/browser/web_contents/aura/overscroll_window_animation.cc |
+++ b/content/browser/web_contents/aura/overscroll_window_animation.cc |
@@ -100,8 +100,12 @@ void OverscrollWindowAnimation::OnOverscrollModeChange( |
Direction new_direction = GetDirectionForMode(new_mode); |
if (new_direction == SLIDE_NONE) { |
// The user cancelled the in progress animation. |
- if (is_active()) |
+ if (is_active()) { |
CancelSlide(); |
+ } else { |
+ overscroll_source_ = OverscrollSource::NONE; |
+ direction_ = SLIDE_NONE; |
+ } |
return; |
} |
if (is_active()) { |