Source/web/WebViewImpl.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/web/WebViewImpl.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/web/WebViewImpl.cpp

diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp

index 870913bbd6e4a9e2bfee1a1f3deac1a83680c753..537ec2ece4d68f730694ef892c1ef33659abae53 100644

--- a/Source/web/WebViewImpl.cpp

+++ b/Source/web/WebViewImpl.cpp

@@ -4286,10 +4286,9 @@ void WebViewImpl::updateMainFrameScrollPosition(const DoublePoint& scrollPositio

if (scrollableArea->scrollPositionDouble() == scrollPosition)

return;

- bool oldProgrammaticScroll = frameView->inProgrammaticScroll();

- frameView->setInProgrammaticScroll(programmaticScroll);

scrollableArea->notifyScrollPositionChanged(scrollPosition);

- frameView->setInProgrammaticScroll(oldProgrammaticScroll);

+ if (!programmaticScroll)

+ frameView->setWasScrolledByUser(true);

}

void WebViewImpl::applyViewportDeltas(

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