Source/core/animation/Animation.cpp - Issue 946323002: Animations: Introduce compositor AnimationPlayer and AnimationTimeline.

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: Source/core/animation/Animation.cpp

Issue 946323002: Animations: Introduce compositor AnimationPlayer and AnimationTimeline. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 5 years, 10 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

Index: Source/core/animation/Animation.cpp

diff --git a/Source/core/animation/Animation.cpp b/Source/core/animation/Animation.cpp

index 397cbb20bd1019e060f77e59bb911151c2a9d98a..c1cef9ba56f87d4deee87aff9f8d3684e8160f1d 100644

--- a/Source/core/animation/Animation.cpp

+++ b/Source/core/animation/Animation.cpp

@@ -295,7 +295,7 @@ void Animation::cancelAnimationOnCompositor()

if (!m_target || !m_target->renderer())

return;

for (const auto& compositorAnimationId : m_compositorAnimationIds)

- CompositorAnimations::instance()->cancelAnimationOnCompositor(*m_target, compositorAnimationId);

+ CompositorAnimations::instance()->cancelAnimationOnCompositor(*m_target, player(), compositorAnimationId);

m_compositorAnimationIds.clear();

player()->setCompositorPending(true);

}

@@ -312,7 +312,7 @@ void Animation::pauseAnimationForTestingOnCompositor(double pauseTime)

if (!m_target || !m_target->renderer())

return;

for (const auto& compositorAnimationId : m_compositorAnimationIds)

- CompositorAnimations::instance()->pauseAnimationForTestingOnCompositor(*m_target, compositorAnimationId, pauseTime);

+ CompositorAnimations::instance()->pauseAnimationForTestingOnCompositor(*m_target, player(), compositorAnimationId, pauseTime);

}

void Animation::trace(Visitor* visitor)

« no previous file with comments | « no previous file | Source/core/animation/AnimationPlayer.h » ('j') | Source/core/animation/AnimationPlayer.h » ('J')