Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(420)

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: Fix the order. Created 5 years, 9 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 | « no previous file | Source/core/animation/AnimationPlayer.h » ('j') | Source/core/animation/AnimationPlayer.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/Animation.cpp
diff --git a/Source/core/animation/Animation.cpp b/Source/core/animation/Animation.cpp
index 23297a040c5752e4c47c38bbd8c2802d4cce067d..bff59ec64c18f7061f01f17e242f7381318c026b 100644
--- a/Source/core/animation/Animation.cpp
+++ b/Source/core/animation/Animation.cpp
@@ -275,7 +275,7 @@ bool Animation::cancelAnimationOnCompositor()
if (!m_target || !m_target->layoutObject())
return false;
for (const auto& compositorAnimationId : m_compositorAnimationIds)
- CompositorAnimations::instance()->cancelAnimationOnCompositor(*m_target, compositorAnimationId);
+ CompositorAnimations::instance()->cancelAnimationOnCompositor(*m_target, player(), compositorAnimationId);
m_compositorAnimationIds.clear();
return true;
}
@@ -298,7 +298,7 @@ void Animation::pauseAnimationForTestingOnCompositor(double pauseTime)
if (!m_target || !m_target->layoutObject())
return;
for (const auto& compositorAnimationId : m_compositorAnimationIds)
- CompositorAnimations::instance()->pauseAnimationForTestingOnCompositor(*m_target, compositorAnimationId, pauseTime);
+ CompositorAnimations::instance()->pauseAnimationForTestingOnCompositor(*m_target, player(), compositorAnimationId, pauseTime);
}
DEFINE_TRACE(Animation)
« no previous file with comments | « no previous file | Source/core/animation/AnimationPlayer.h » ('j') | Source/core/animation/AnimationPlayer.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698