third_party/WebKit/Source/core/page/AutoscrollController.cpp - Issue 1461473002: Ensure that the auto scroll state in the AutoscrollController is cleared if the scroll operation cl…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/page/AutoscrollController.cpp

Issue 1461473002: Ensure that the auto scroll state in the AutoscrollController is cleared if the scroll operation cl… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add layouttests Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« third_party/WebKit/LayoutTests/fast/events/autoscroll-scrollable-iframe-div.html ('K') | « third_party/WebKit/LayoutTests/fast/events/resources/iframe-with-overflow-scrollable-div.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/third_party/WebKit/Source/core/page/AutoscrollController.cpp b/third_party/WebKit/Source/core/page/AutoscrollController.cpp

index 38650aaf05c81d52b2e435a7bc625e765b137ce0..a3f79c56c73840bd5241b8430a13a96a0c798497 100644

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

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

@@ -131,7 +131,12 @@ void AutoscrollController::updateAutoscrollLayoutObject()

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)