third_party/WebKit/Source/core/animation/CompositorPendingAnimations.cpp - Issue 1417613005: Revert of Web Animations: Use a single animation clock

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/animation/CompositorPendingAnimations.cpp

Issue 1417613005: Revert of Web Animations: Use a single animation clock (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 2 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/core/animation/CompositorAnimationsTest.cpp ('k') | third_party/WebKit/Source/core/animation/DocumentAnimations.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/animation/CompositorPendingAnimations.cpp

diff --git a/third_party/WebKit/Source/core/animation/CompositorPendingAnimations.cpp b/third_party/WebKit/Source/core/animation/CompositorPendingAnimations.cpp

index 19eb9a53d93fd6564cf8284263279fdea6056947..376fb93d6772a2ff16f86cba82e1d77c73cb574e 100644

--- a/third_party/WebKit/Source/core/animation/CompositorPendingAnimations.cpp

+++ b/third_party/WebKit/Source/core/animation/CompositorPendingAnimations.cpp

@@ -80,7 +80,7 @@

startedSynchronizedOnCompositor = true;

}

- if (animation->playing() && !animation->hasStartTime() && animation->timeline() && animation->timeline()->isActive()) {

+ if (animation->playing() && !animation->hasStartTime()) {

waitingForStartTime.append(animation.get());

}

} else {

@@ -142,7 +142,7 @@

animations.swap(m_waitingForCompositorAnimationStart);

for (auto animation : animations) {

- if (animation->hasStartTime() || animation->playStateInternal() != Animation::Pending || !animation->timeline() || !animation->timeline()->isActive()) {

+ if (animation->hasStartTime() || animation->playStateInternal() != Animation::Pending) {

// Already started or no longer relevant.

continue;

}