Reset overscroll state when OverscrollWindowDelegate is destroyed.

content/browser/web_contents/aura/overscroll_window_delegate.cc

 // Copyright 2015 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 "content/browser/web_contents/aura/overscroll_window_delegate.h"
 
 #include "base/i18n/rtl.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/renderer_host/overscroll_controller_delegate.h"
 #include "content/public/browser/overscroll_configuration.h"
 #include "ui/aura/window.h"
 #include "ui/events/event.h"
 #include "ui/gfx/image/image_png_rep.h"
 
 namespace content {
 
 OverscrollWindowDelegate::OverscrollWindowDelegate(
     OverscrollControllerDelegate* delegate,
     const gfx::Image& image)
     : delegate_(delegate),
-      overscroll_mode_(OVERSCROLL_NONE),
-      delta_x_(0.f),
       complete_threshold_ratio_(content::GetOverscrollConfig(
           content::OVERSCROLL_CONFIG_HORIZ_THRESHOLD_COMPLETE)),
       start_threshold_touchscreen_(content::GetOverscrollConfig(
           content::OVERSCROLL_CONFIG_HORIZ_THRESHOLD_START_TOUCHSCREEN)),
       start_threshold_touchpad_(content::GetOverscrollConfig(
-          content::OVERSCROLL_CONFIG_HORIZ_THRESHOLD_START_TOUCHPAD)),
-      active_start_threshold_(0.f) {
+          content::OVERSCROLL_CONFIG_HORIZ_THRESHOLD_START_TOUCHPAD)) {
   SetImage(image);
 }
 
 OverscrollWindowDelegate::~OverscrollWindowDelegate() {
+  ResetOverscroll();
 }
 
 void OverscrollWindowDelegate::StartOverscroll(OverscrollSource source) {
   OverscrollMode old_mode = overscroll_mode_;
   if (delta_x_ > 0)
     overscroll_mode_ = OVERSCROLL_EAST;
   else
     overscroll_mode_ = OVERSCROLL_WEST;
   overscroll_source_ = source;
   delegate_->OnOverscrollModeChange(old_mode, overscroll_mode_, source);
@@ skipping 85 matching lines @@
       ResetOverscroll();
       break;
 
     default:
       break;
   }
   event->SetHandled();
 }
 
 }  // namespace content