Source/core/loader/FrameLoader.cpp - Issue 1113973002: Remove FrameView::m_inProgrammaticScroll and related plumbing.

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: Source/core/loader/FrameLoader.cpp

Issue 1113973002: Remove FrameView::m_inProgrammaticScroll and related plumbing. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 5 years, 8 months 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

Index: Source/core/loader/FrameLoader.cpp

diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp

index 5d17ba671aa3458daf719ad25a587e7f1377e09b..6dd0c504a089d05a966b4cba3069ed6504041639 100644

--- a/Source/core/loader/FrameLoader.cpp

+++ b/Source/core/loader/FrameLoader.cpp

@@ -1047,7 +1047,9 @@ void FrameLoader::restoreScrollPositionAndViewState()

m_frame->host()->pinchViewport().setLocation(pinchViewportOffset);

} else {

- view->setScrollPositionNonProgrammatically(m_currentItem->scrollPoint());

+ IntPoint adjustedScrollPosition = view->adjustScrollPositionWithinRange(m_currentItem->scrollPoint());

+ if (adjustedScrollPosition != view->scrollPosition())

+ view->notifyScrollPositionChanged(adjustedScrollPosition);

}

if (m_frame->isMainFrame()) {

« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | Source/core/page/EventHandler.cpp » ('j') | no next file with comments »