third_party/WebKit/Source/core/frame/FrameView.cpp - Issue 1543043004: Reland of un smooth scroll animations on the compositor when possible

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/core/frame/FrameView.cpp

Issue 1543043004: Reland of un smooth scroll animations on the compositor when possible (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/LayoutTests/fast/scroll-behavior/smooth-scroll/mousewheel-scroll-expected.txt ('k') | third_party/WebKit/Source/core/input/EventHandler.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/frame/FrameView.cpp

diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp

index 09546b9c07ab0bb84eb72169a14e49969e352496..8c1c480dfb763a4ea7b7668abe84f62012e79931 100644

--- a/third_party/WebKit/Source/core/frame/FrameView.cpp

+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp

@@ -265,7 +265,7 @@

RELEASE_ASSERT(!isInPerformLayout());

if (ScrollAnimatorBase* scrollAnimator = existingScrollAnimator())

- scrollAnimator->cancelAnimations();

+ scrollAnimator->cancelAnimation();

cancelProgrammaticScrollAnimation();

detachScrollbars();