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

Unified Diff: Source/core/animation/AnimationPlayer.cpp

Issue 1131833002: [Sketch] Animations: Torpedo the old intrusive animation system. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@scroll
Patch Set: Delete more. Created 5 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 | « no previous file | Source/core/animation/AnimationTimeline.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/AnimationPlayer.cpp
diff --git a/Source/core/animation/AnimationPlayer.cpp b/Source/core/animation/AnimationPlayer.cpp
index 99a947be0be39fd2838bd2cb755a7331076d2671..a6ffd822f96b8218a69c023e434105628e05bf75 100644
--- a/Source/core/animation/AnimationPlayer.cpp
+++ b/Source/core/animation/AnimationPlayer.cpp
@@ -854,7 +854,7 @@ void AnimationPlayer::endUpdatingState()
void AnimationPlayer::createCompositorPlayer()
{
- if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled() && !m_compositorPlayer && Platform::current()->compositorSupport()) {
+ if (!m_compositorPlayer) {
m_compositorPlayer = adoptPtr(Platform::current()->compositorSupport()->createAnimationPlayer());
ASSERT(m_compositorPlayer);
m_compositorPlayer->setAnimationDelegate(this);
@@ -895,7 +895,7 @@ void AnimationPlayer::detachCompositorTimeline()
void AnimationPlayer::attachCompositedLayers()
{
- if (!RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled() || !m_compositorPlayer)
+ if (!m_compositorPlayer)
return;
ASSERT(m_content);
@@ -913,7 +913,6 @@ void AnimationPlayer::detachCompositedLayers()
void AnimationPlayer::notifyAnimationStarted(double monotonicTime, int group)
{
- ASSERT(RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled());
timeline()->document()->compositorPendingAnimations().notifyCompositorAnimationStarted(monotonicTime, group);
}
« no previous file with comments | « no previous file | Source/core/animation/AnimationTimeline.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698