Blink Compositor Animation: Erase CompositorAnimationsImpl.h

third_party/WebKit/Source/core/animation/KeyframeEffect.cpp

Index: third_party/WebKit/Source/core/animation/KeyframeEffect.cpp
diff --git a/third_party/WebKit/Source/core/animation/KeyframeEffect.cpp b/third_party/WebKit/Source/core/animation/KeyframeEffect.cpp
index eb90cf50026449e67aa170908ad9183e495383ca..318a11ae302311a059d380984fd32224c7b82bb9 100644
--- a/third_party/WebKit/Source/core/animation/KeyframeEffect.cpp
+++ b/third_party/WebKit/Source/core/animation/KeyframeEffect.cpp
@@ -285,7 +285,7 @@ bool KeyframeEffect::isCandidateForAnimationOnCompositor(double animationPlaybac
         || hasMultipleTransformProperties())
         return false;
 
-    return CompositorAnimations::instance()->isCandidateForAnimationOnCompositor(specifiedTiming(), *m_target, animation(), *model(), animationPlaybackRate);
+    return CompositorAnimations::isCandidateForAnimationOnCompositor(specifiedTiming(), *m_target, animation(), *model(), animationPlaybackRate);
 }
 
 bool KeyframeEffect::maybeStartAnimationOnCompositor(int group, double startTime, double currentTime, double animationPlaybackRate)
@@ -293,9 +293,9 @@ bool KeyframeEffect::maybeStartAnimationOnCompositor(int group, double startTime
     ASSERT(!hasActiveAnimationsOnCompositor());
     if (!isCandidateForAnimationOnCompositor(animationPlaybackRate))
         return false;
-    if (!CompositorAnimations::instance()->canStartAnimationOnCompositor(*m_target))
+    if (!CompositorAnimations::canStartAnimationOnCompositor(*m_target))
         return false;
-    CompositorAnimations::instance()->startAnimationOnCompositor(*m_target, group, startTime, currentTime, specifiedTiming(), *animation(), *model(), m_compositorAnimationIds, animationPlaybackRate);
+    CompositorAnimations::startAnimationOnCompositor(*m_target, group, startTime, currentTime, specifiedTiming(), *animation(), *model(), m_compositorAnimationIds, animationPlaybackRate);
     ASSERT(!m_compositorAnimationIds.isEmpty());
     return true;
 }
@@ -327,7 +327,7 @@ bool KeyframeEffect::cancelAnimationOnCompositor()
         return false;
     ASSERT(animation());
     for (const auto& compositorAnimationId : m_compositorAnimationIds)
-        CompositorAnimations::instance()->cancelAnimationOnCompositor(*m_target, *animation(), compositorAnimationId);
+        CompositorAnimations::cancelAnimationOnCompositor(*m_target, *animation(), compositorAnimationId);
     m_compositorAnimationIds.clear();
     return true;
 }
@@ -341,7 +341,7 @@ void KeyframeEffect::restartAnimationOnCompositor()
 void KeyframeEffect::cancelIncompatibleAnimationsOnCompositor()
 {
     if (m_target && animation() && model())
-        CompositorAnimations::instance()->cancelIncompatibleAnimationsOnCompositor(*m_target, *animation(), *model());
+        CompositorAnimations::cancelIncompatibleAnimationsOnCompositor(*m_target, *animation(), *model());
 }
 
 void KeyframeEffect::pauseAnimationForTestingOnCompositor(double pauseTime)
@@ -351,7 +351,7 @@ void KeyframeEffect::pauseAnimationForTestingOnCompositor(double pauseTime)
         return;
     ASSERT(animation());
     for (const auto& compositorAnimationId : m_compositorAnimationIds)
-        CompositorAnimations::instance()->pauseAnimationForTestingOnCompositor(*m_target, *animation(), compositorAnimationId, pauseTime);
+        CompositorAnimations::pauseAnimationForTestingOnCompositor(*m_target, *animation(), compositorAnimationId, pauseTime);
 }
 
 bool KeyframeEffect::canAttachCompositedLayers() const
@@ -359,14 +359,14 @@ bool KeyframeEffect::canAttachCompositedLayers() const
     if (!m_target || !animation())
         return false;
 
-    return CompositorAnimations::instance()->canAttachCompositedLayers(*m_target, *animation());
+    return CompositorAnimations::canAttachCompositedLayers(*m_target, *animation());
 }
 
 void KeyframeEffect::attachCompositedLayers()
 {
     ASSERT(m_target);
     ASSERT(animation());
-    CompositorAnimations::instance()->attachCompositedLayers(*m_target, *animation());
+    CompositorAnimations::attachCompositedLayers(*m_target, *animation());
 }
 
 DEFINE_TRACE(KeyframeEffect)