third_party/WebKit/Source/platform/scroll/ScrollAnimator.h - 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.h

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: skip irrelevant test on mac 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

« no previous file with comments | « third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp ('k') | third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 5f021c4104dbb5c62ca3a80b22c754ed2b169e3c..18469bd8b62264e91bb39445364dab045cdf17d7 100644

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

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

@@ -48,7 +48,7 @@ public:

explicit ScrollAnimator(ScrollableArea*, WTF::TimeFunction = WTF::monotonicallyIncreasingTime);

~ScrollAnimator() override;

- bool hasRunningAnimation() const;

+ bool hasRunningAnimation() const override;

float computeDeltaToConsume(ScrollbarOrientation, float pixelDelta) const override;

ScrollResultOneDimensional userScroll(ScrollbarOrientation, ScrollGranularity, float step, float delta) override;

@@ -77,6 +77,11 @@ private:

// immediately to the target and returns false.

bool registerAndScheduleAnimation();

+ void postAnimationCleanupAndReset();

+ void addMainThreadScrollingReason();

+ void removeMainThreadScrollingReason();

FloatPoint m_targetOffset;

ScrollGranularity m_lastGranularity;

};