Blink Compositor Animation: Erase CompositorAnimationsImpl.h

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

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 267 matching lines @@
 bool KeyframeEffect::isCandidateForAnimationOnCompositor(double animationPlaybackRate) const
 {
     // Do not put transforms on compositor if more than one of them are defined
     // in computed style because they need to be explicitly ordered
     if (!model()
         || !m_target
         || (m_target->computedStyle() && m_target->computedStyle()->hasMotionPath())
         || 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)
 {
     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;
 }
 
 bool KeyframeEffect::hasActiveAnimationsOnCompositor() const
 {
     return !m_compositorAnimationIds.isEmpty();
 }
 
 bool KeyframeEffect::hasActiveAnimationsOnCompositor(CSSPropertyID property) const
@@ skipping 11 matching lines @@
     // FIXME: cancelAnimationOnCompositor is called from withins style recalc.
     // This queries compositingState, which is not necessarily up to date.
     // https://code.google.com/p/chromium/issues/detail?id=339847
     DisableCompositingQueryAsserts disabler;
     if (!hasActiveAnimationsOnCompositor())
         return false;
     if (!m_target || !m_target->layoutObject())
         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;
 }
 
 void KeyframeEffect::restartAnimationOnCompositor()
 {
     if (cancelAnimationOnCompositor())
         animation()->setCompositorPending(true);
 }
 
 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)
 {
     ASSERT(hasActiveAnimationsOnCompositor());
     if (!m_target || !m_target->layoutObject())
         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
 {
     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)
 {
     visitor->trace(m_target);
     visitor->trace(m_model);
     visitor->trace(m_sampledEffect);
     AnimationEffect::trace(visitor);
 }
 
 } // namespace blink