Blink Compositor Animation: Erase old animation system.

third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp

Index: third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
index d35fe84952b0240996fbe3a25a88f098afe18104..347b271cf25c987c7050fda217f618c32a00e86b 100644
--- a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
+++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
@@ -24,12 +24,9 @@ ScrollAnimatorCompositorCoordinator::ScrollAnimatorCompositorCoordinator()
 #if ENABLE(OILPAN)
     ThreadState::current()->registerPreFinalizer(this);
 #endif
-    if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled()) {
-        ASSERT(Platform::current()->compositorSupport());
-        m_compositorPlayer = adoptPtr(CompositorFactory::current().createAnimationPlayer());
-        ASSERT(m_compositorPlayer);
-        m_compositorPlayer->setAnimationDelegate(this);
-    }
+    m_compositorPlayer = adoptPtr(CompositorFactory::current().createAnimationPlayer());
+    ASSERT(m_compositorPlayer);
+    m_compositorPlayer->setAnimationDelegate(this);
 }
 
 ScrollAnimatorCompositorCoordinator::~ScrollAnimatorCompositorCoordinator()
@@ -41,10 +38,8 @@ ScrollAnimatorCompositorCoordinator::~ScrollAnimatorCompositorCoordinator()
 
 void ScrollAnimatorCompositorCoordinator::dispose()
 {
-    if (m_compositorPlayer) {
-        m_compositorPlayer->setAnimationDelegate(nullptr);
-        m_compositorPlayer.clear();
-    }
+    m_compositorPlayer->setAnimationDelegate(nullptr);
+    m_compositorPlayer.clear();
 }
 
 void ScrollAnimatorCompositorCoordinator::resetAnimationState()
@@ -74,37 +69,23 @@ bool ScrollAnimatorCompositorCoordinator::hasAnimationThatRequiresService() cons
 bool ScrollAnimatorCompositorCoordinator::addAnimation(
     PassOwnPtr<CompositorAnimation> animation)
 {
-    if (m_compositorPlayer) {
-        if (m_compositorPlayer->isLayerAttached()) {
-            m_compositorPlayer->addAnimation(animation.leakPtr());
-            return true;
-        }
-    } else {
-        return scrollableArea()->layerForScrolling()->addAnimation(animation);
+    if (m_compositorPlayer->isLayerAttached()) {
+        m_compositorPlayer->addAnimation(animation.leakPtr());
+        return true;
     }
     return false;
 }
 
 void ScrollAnimatorCompositorCoordinator::removeAnimation()
 {
-    if (m_compositorPlayer) {
-        if (m_compositorPlayer->isLayerAttached())
-            m_compositorPlayer->removeAnimation(m_compositorAnimationId);
-    } else {
-        if (GraphicsLayer* layer = scrollableArea()->layerForScrolling())
-            layer->removeAnimation(m_compositorAnimationId);
-    }
+    if (m_compositorPlayer->isLayerAttached())
+        m_compositorPlayer->removeAnimation(m_compositorAnimationId);
 }
 
 void ScrollAnimatorCompositorCoordinator::abortAnimation()
 {
-    if (m_compositorPlayer) {
-        if (m_compositorPlayer->isLayerAttached())
-            m_compositorPlayer->abortAnimation(m_compositorAnimationId);
-    } else {
-        if (GraphicsLayer* layer = scrollableArea()->layerForScrolling())
-            layer->abortAnimation(m_compositorAnimationId);
-    }
+    if (m_compositorPlayer->isLayerAttached())
+        m_compositorPlayer->abortAnimation(m_compositorAnimationId);
 }
 
 void ScrollAnimatorCompositorCoordinator::cancelAnimation()