Revert of Animations: Port ProgrammaticScrollAnimator to use compositor timelines

Source/platform/scroll/ProgrammaticScrollAnimator.cpp

Index: Source/platform/scroll/ProgrammaticScrollAnimator.cpp
diff --git a/Source/platform/scroll/ProgrammaticScrollAnimator.cpp b/Source/platform/scroll/ProgrammaticScrollAnimator.cpp
index 6a128860895ee322cb11e5d5bb91f3a6d191b1fb..1de1c2a307664d35d6c54faa3c17cc3508d879dc 100644
--- a/Source/platform/scroll/ProgrammaticScrollAnimator.cpp
+++ b/Source/platform/scroll/ProgrammaticScrollAnimator.cpp
@@ -5,14 +5,11 @@
 #include "config.h"
 #include "platform/scroll/ProgrammaticScrollAnimator.h"
 
-#include "platform/RuntimeEnabledFeatures.h"
 #include "platform/geometry/IntPoint.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/scroll/ScrollableArea.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebCompositorAnimation.h"
-#include "public/platform/WebCompositorAnimationPlayer.h"
-#include "public/platform/WebCompositorAnimationTimeline.h"
 #include "public/platform/WebCompositorSupport.h"
 #include "public/platform/WebScrollOffsetAnimationCurve.h"
 
@@ -24,27 +21,16 @@
 }
 
 ProgrammaticScrollAnimator::ProgrammaticScrollAnimator(ScrollableArea* scrollableArea)
-    : m_compositorAnimationAttachedToLayerId(0)
-    , m_scrollableArea(scrollableArea)
+    : m_scrollableArea(scrollableArea)
     , m_startTime(0.0)
     , m_runState(RunState::Idle)
     , m_compositorAnimationId(0)
     , m_compositorAnimationGroupId(0)
 {
-    if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled()) {
-        ASSERT(Platform::current()->compositorSupport());
-        m_compositorPlayer = adoptPtr(Platform::current()->compositorSupport()->createAnimationPlayer());
-        ASSERT(m_compositorPlayer);
-        m_compositorPlayer->setAnimationDelegate(this);
-    }
 }
 
 ProgrammaticScrollAnimator::~ProgrammaticScrollAnimator()
 {
-    if (m_compositorPlayer) {
-        m_compositorPlayer->setAnimationDelegate(nullptr);
-        m_compositorPlayer.clear();
-    }
 }
 
 void ProgrammaticScrollAnimator::resetAnimationState()
@@ -150,15 +136,8 @@
         // compositor animation that needs to be removed here before the new
         // animation is added below.
         ASSERT(m_runState == RunState::WaitingToCancelOnCompositor || m_runState == RunState::WaitingToSendToCompositor);
-
-        if (m_compositorPlayer) {
-            if (m_compositorPlayer->isLayerAttached())
-                m_compositorPlayer->removeAnimation(m_compositorAnimationId);
-        } else {
-            if (GraphicsLayer* layer = m_scrollableArea->layerForScrolling())
-                layer->removeAnimation(m_compositorAnimationId);
-        }
-
+        if (GraphicsLayer* layer = m_scrollableArea->layerForScrolling())
+            layer->removeAnimation(m_compositorAnimationId);
         m_compositorAnimationId = 0;
         m_compositorAnimationGroupId = 0;
         if (m_runState == RunState::WaitingToCancelOnCompositor) {
@@ -176,18 +155,7 @@
 
                 int animationId = animation->id();
                 int animationGroupId = animation->group();
-
-                bool animationAdded = false;
-                if (m_compositorPlayer) {
-                    if (m_compositorPlayer->isLayerAttached()) {
-                        m_compositorPlayer->addAnimation(animation.leakPtr());
-                        animationAdded = true;
-                    }
-                } else {
-                    animationAdded = m_scrollableArea->layerForScrolling()->addAnimation(animation.release());
-                }
-
-                if (animationAdded) {
+                if (m_scrollableArea->layerForScrolling()->addAnimation(animation.release())) {
                     sentToCompositor = true;
                     m_runState = RunState::RunningOnCompositor;
                     m_compositorAnimationId = animationId;
@@ -206,35 +174,8 @@
     }
 }
 
-void ProgrammaticScrollAnimator::reattachCompositorPlayerIfNeeded(WebCompositorAnimationTimeline* timeline)
-{
-    int compositorAnimationAttachedToLayerId = 0;
-    if (m_scrollableArea->layerForScrolling())
-        compositorAnimationAttachedToLayerId = m_scrollableArea->layerForScrolling()->platformLayer()->id();
-
-    if (compositorAnimationAttachedToLayerId != m_compositorAnimationAttachedToLayerId) {
-        if (m_compositorPlayer && timeline) {
-            // Detach from old layer (if any).
-            if (m_compositorAnimationAttachedToLayerId) {
-                ASSERT(m_compositorPlayer->isLayerAttached());
-                m_compositorPlayer->detachLayer();
-                timeline->playerDestroyed(*this);
-            }
-            // Attach to new layer (if any).
-            if (compositorAnimationAttachedToLayerId) {
-                ASSERT(m_scrollableArea->layerForScrolling());
-                timeline->playerAttached(*this);
-                m_compositorPlayer->attachLayer(m_scrollableArea->layerForScrolling()->platformLayer());
-            }
-            m_compositorAnimationAttachedToLayerId = compositorAnimationAttachedToLayerId;
-        }
-    }
-}
-
-void ProgrammaticScrollAnimator::layerForCompositedScrollingDidChange(WebCompositorAnimationTimeline* timeline)
-{
-    reattachCompositorPlayerIfNeeded(timeline);
-
+void ProgrammaticScrollAnimator::layerForCompositedScrollingDidChange()
+{
     // If the composited scrolling layer is lost during a composited animation,
     // continue the animation on the main thread.
     if (m_runState == RunState::RunningOnCompositor && !m_scrollableArea->layerForScrolling()) {
@@ -271,18 +212,4 @@
     }
 }
 
-void ProgrammaticScrollAnimator::notifyAnimationStarted(double monotonicTime, int group)
-{
-}
-
-void ProgrammaticScrollAnimator::notifyAnimationFinished(double monotonicTime, int group)
-{
-    notifyCompositorAnimationFinished(group);
-}
-
-WebCompositorAnimationPlayer* ProgrammaticScrollAnimator::compositorPlayer() const
-{
-    return m_compositorPlayer.get();
-}
-
 } // namespace blink