third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp - Issue 2006103004: Send takeover msg from MT to CC using the animation path.

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 2006103004: Send takeover msg from MT to CC using the animation path. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: jbroman nits Created 4 years, 7 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/platform/scroll/ScrollAnimator.h ('k') | third_party/WebKit/Source/platform/scroll/ScrollAnimatorBase.h » ('j') | 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 4791dba24949ece23ae9d1f80205c1d51bb57b3f..3bb8b201c314f10bf27e736821f4068bb585bcc0 100644

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

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

@@ -286,7 +286,7 @@ void ScrollAnimator::updateCompositorAnimations()

if (m_runState == RunState::RunningOnCompositorButNeedsTakeover) {

// The animation is already aborted when the call to

- // ::takeoverCompositorAnimation is made.

+ // ::takeOverCompositorAnimation is made.

m_runState = RunState::WaitingToSendToCompositor;

} else {

abortAnimation();

@@ -401,13 +401,13 @@ void ScrollAnimator::cancelAnimation()

ScrollAnimatorCompositorCoordinator::cancelAnimation();

}

-void ScrollAnimator::takeoverCompositorAnimation()

+void ScrollAnimator::takeOverCompositorAnimation()

{

if (m_runState == RunState::RunningOnCompositor

|| m_runState == RunState::RunningOnCompositorButNeedsUpdate)

removeMainThreadScrollingReason();

- ScrollAnimatorCompositorCoordinator::takeoverCompositorAnimation();

+ ScrollAnimatorCompositorCoordinator::takeOverCompositorAnimation();

}

void ScrollAnimator::layerForCompositedScrollingDidChange(