third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp - Issue 1648293003: Fix smooth scroll jump when switching scroll handling between MT and CC

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/platform/scroll/ScrollAnimator.cpp

Issue 1648293003: Fix smooth scroll jump when switching scroll handling between MT and CC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: remove fn to clear all main thread scrolling reasons Created 4 years, 10 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

« third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp ('K') | « third_party/WebKit/Source/platform/scroll/ScrollAnimator.h ('k') | third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.h » ('j') | third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp

diff --git a/third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp b/third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp

index de0000b4a8f5a948cb00f564d08a62014024fb01..d093b91364fa430ce734e6d2eae7e7a470cb9370 100644

--- a/third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp

+++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp

@@ -259,10 +259,16 @@ void ScrollAnimator::updateCompositorAnimations()

}

+ bool runningOnMainThread = false;

if (!sentToCompositor) {

- if (registerAndScheduleAnimation())

+ runningOnMainThread = registerAndScheduleAnimation();

+ if (runningOnMainThread)

m_runState = RunState::RunningOnMainThread;

}

+ // Main thread should deal with the scroll animations it started.

+ if (sentToCompositor || runningOnMainThread)

+ addMainThreadScrollingReason();

}