third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp - Issue 1547003002: Fix error in determining the target position for smooth scroll animation curve

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 1547003002: Fix error in determining the target position for smooth scroll animation curve (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: add test 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

« third_party/WebKit/LayoutTests/fast/scroll-behavior/smooth-scroll/mousewheel-scroll.html ('K') | « third_party/WebKit/LayoutTests/fast/scroll-behavior/smooth-scroll/mousewheel-scroll-expected.txt ('k') | no next file » | no next file with comments »
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 fa45f0fbb336941b72ca0dccdcc5c4a662e0e5c6..a4cbca3bb05322091a4cad3d7f003a9579212ffe 100644

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

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

@@ -61,7 +61,8 @@ ScrollAnimator::~ScrollAnimator()

FloatPoint ScrollAnimator::desiredTargetPosition() const

{

- return m_animationCurve ? m_targetOffset : currentPosition();

+ return m_animationCurve || m_runState == RunState::WaitingToSendToCompositor

Rick Byers 2015/12/23 19:13:34 nit: please add brackets around the condition expr

ymalik 2015/12/23 19:20:37 Done.

+ ? m_targetOffset : currentPosition();

}

float ScrollAnimator::computeDeltaToConsume(