third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp - Issue 1926473003: Smooth scroll animation should not override scroll anchoring update (MT)

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/ScrollAnimatorCompositorCoordinator.cpp

Issue 1926473003: Smooth scroll animation should not override scroll anchoring update (MT) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: disable test for mac Created 4 years, 8 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/ScrollAnimatorCompositorCoordinator.h ('k') | third_party/WebKit/Source/platform/scroll/ScrollAnimatorTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp

diff --git a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp

index 5dcc838fcfe1c0a0e10bc00ad189a783e977f59e..41858117597c83e260d30c92e1c10d6dba15207d 100644

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

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

@@ -51,6 +51,7 @@ bool ScrollAnimatorCompositorCoordinator::hasAnimationThatRequiresService() cons

case RunState::Idle:

case RunState::RunningOnCompositor:

return false;

+ case RunState::WaitingToCancelOnCompositorButNewScroll:

case RunState::PostAnimationCleanup:

case RunState::WaitingToSendToCompositor:

case RunState::RunningOnMainThread:

@@ -104,6 +105,7 @@ void ScrollAnimatorCompositorCoordinator::cancelAnimation()

case RunState::RunningOnMainThread:

m_runState = RunState::PostAnimationCleanup;

break;

+ case RunState::WaitingToCancelOnCompositorButNewScroll:

case RunState::RunningOnCompositorButNeedsUpdate:

case RunState::RunningOnCompositor:

m_runState = RunState::WaitingToCancelOnCompositor;

@@ -118,6 +120,7 @@ void ScrollAnimatorCompositorCoordinator::takeoverCompositorAnimation()

switch (m_runState) {

case RunState::Idle:

case RunState::WaitingToCancelOnCompositor:

+ case RunState::WaitingToCancelOnCompositorButNewScroll:

case RunState::PostAnimationCleanup:

case RunState::RunningOnCompositorButNeedsTakeover:

case RunState::WaitingToSendToCompositor:

@@ -153,6 +156,7 @@ void ScrollAnimatorCompositorCoordinator::compositorAnimationFinished(

ASSERT_NOT_REACHED();

break;

case RunState::WaitingToSendToCompositor:

+ case RunState::WaitingToCancelOnCompositorButNewScroll:

break;

case RunState::RunningOnCompositor:

case RunState::RunningOnCompositorButNeedsUpdate:

@@ -253,6 +257,8 @@ String ScrollAnimatorCompositorCoordinator::runStateAsText() const

return String("PostAnimationCleanup");

case RunState::RunningOnCompositorButNeedsTakeover:

return String("RunningOnCompositorButNeedsTakeover");

+ case RunState::WaitingToCancelOnCompositorButNewScroll:

+ return String("WaitingToCancelOnCompositorButNewScroll");

}

ASSERT_NOT_REACHED();

return String();