Ensure that the auto scroll state in the AutoscrollController is cleared if the scroll operation cl…

third_party/WebKit/Source/core/page/AutoscrollController.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
@@ skipping 113 matching lines @@
 
 #if OS(WIN)
     HitTestResult hitTest = layoutObject->frame()->eventHandler().hitTestResultAtPoint(m_panScrollStartPos, HitTestRequest::ReadOnly | HitTestRequest::Active);
 
     if (Node* nodeAtPoint = hitTest.innerNode())
         layoutObject = nodeAtPoint->layoutObject();
 #endif
 
     while (layoutObject && !(layoutObject->isBox() && toLayoutBox(layoutObject)->canAutoscroll()))
         layoutObject = layoutObject->parent();
-    m_autoscrollLayoutObject = layoutObject && layoutObject->isBox() ? toLayoutBox(layoutObject) : nullptr;
+
+    LayoutBox* autoscrollLayoutObject = layoutObject && layoutObject->isBox() ? toLayoutBox(layoutObject) : nullptr;
+    if (m_autoscrollLayoutObject && !autoscrollLayoutObject)
+        stopAutoscrollIfNeeded(m_autoscrollLayoutObject);
+
+    m_autoscrollLayoutObject = autoscrollLayoutObject;
 }
 
 void AutoscrollController::updateDragAndDrop(Node* dropTargetNode, const IntPoint& eventPosition, double eventTime)
 {
     if (!dropTargetNode || !dropTargetNode->layoutObject()) {
         stopAutoscroll();
         return;
     }
 
     if (m_autoscrollLayoutObject && m_autoscrollLayoutObject->frame() != dropTargetNode->layoutObject()->frame())
@@ skipping 153 matching lines @@
         view->setCursor(eastPanningCursor());
     } else if (west) {
         view->setCursor(westPanningCursor());
     } else {
         view->setCursor(middlePanningCursor());
     }
 }
 #endif
 
 } // namespace blink