third_party/WebKit/Source/platform/scroll/ScrollAnimator.h - Issue 1496693005: Update RootFrameViewport::userScroll to distribute scrolls between viewports.

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 1496693005: Update RootFrameViewport::userScroll to distribute scrolls between viewports. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years 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/platform/mac/ScrollAnimatorMac.mm ('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 257f734a4c185f933d60c7b6e5d7d25527864983..01746e683e176296ad1cc6b591801b1803e85b90 100644

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

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

@@ -45,6 +45,8 @@ public:

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

~ScrollAnimator() override;

+ float computeDeltaToConsume(ScrollbarOrientation, float pixelDelta) const override;

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

void scrollToOffsetWithoutAnimation(const FloatPoint&) override;

@@ -60,6 +62,8 @@ protected:

OwnPtr<WebScrollOffsetAnimationCurve> m_animationCurve;

double m_startTime;

WTF::TimeFunction m_timeFunction;

+private:

+ FloatPoint desiredTargetPosition() const;

};

} // namespace blink