Animations: Introduce compositor AnimationPlayer and AnimationTimeline.

Source/core/animation/CompositorAnimations.cpp

Index: Source/core/animation/CompositorAnimations.cpp
diff --git a/Source/core/animation/CompositorAnimations.cpp b/Source/core/animation/CompositorAnimations.cpp
index 93a39b43bb6c82aab21d974f71934d5469b6f0f1..2283492f787950f75bd24d679eab8d54829061c5 100644
--- a/Source/core/animation/CompositorAnimations.cpp
+++ b/Source/core/animation/CompositorAnimations.cpp
@@ -46,6 +46,7 @@
 #include "platform/geometry/FloatBox.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebCompositorAnimation.h"
+#include "public/platform/WebCompositorAnimationPlayer.h"
 #include "public/platform/WebCompositorSupport.h"
 #include "public/platform/WebFilterAnimationCurve.h"
 #include "public/platform/WebFilterKeyframe.h"
@@ -255,6 +256,8 @@ bool CompositorAnimations::canStartAnimationOnCompositor(const Element& element)
     return element.renderer() && element.renderer()->compositingState() == PaintsIntoOwnBacking;
 }
 
+#define HEAVISIDE_ANIMATIONS 1
+
 bool CompositorAnimations::startAnimationOnCompositor(const Element& element, int group, double startTime, double timeOffset, const Timing& timing, const AnimationPlayer* player, const AnimationEffect& effect, Vector<int>& startedAnimationIds, double playerPlaybackRate)
 {
     ASSERT(startedAnimationIds.isEmpty());
@@ -271,20 +274,28 @@ bool CompositorAnimations::startAnimationOnCompositor(const Element& element, in
     ASSERT(!animations.isEmpty());
     for (auto& animation : animations) {
         int id = animation->id();
+#if HEAVISIDE_ANIMATIONS
+        ASSERT(player);
+        WebCompositorAnimationPlayer* compositorPlayer = player->compositorPlayer();
+        ASSERT(compositorPlayer);
+        compositorPlayer->attachLayer(layer->compositedLayerMapping()->mainGraphicsLayer()->platformLayer());
+        compositorPlayer->addAnimation(animation.leakPtr());
+#else
         if (!layer->compositedLayerMapping()->mainGraphicsLayer()->addAnimation(animation.release())) {
             // FIXME: We should know ahead of time whether these animations can be started.
             for (int startedAnimationId : startedAnimationIds)
-                cancelAnimationOnCompositor(element, startedAnimationId);
+                cancelAnimationOnCompositor(element, player, startedAnimationId);
             startedAnimationIds.clear();
             return false;
         }
+#endif
         startedAnimationIds.append(id);
     }
     ASSERT(!startedAnimationIds.isEmpty());
     return true;
 }
 
-void CompositorAnimations::cancelAnimationOnCompositor(const Element& element, int id)
+void CompositorAnimations::cancelAnimationOnCompositor(const Element& element, const AnimationPlayer* player, int id)
 {
     if (!canStartAnimationOnCompositor(element)) {
         // When an element is being detached, we cancel any associated
@@ -294,10 +305,17 @@ void CompositorAnimations::cancelAnimationOnCompositor(const Element& element, i
         // compositing update.
         return;
     }
+#if HEAVISIDE_ANIMATIONS
+    ASSERT(player);
+    WebCompositorAnimationPlayer* compositorPlayer = player->compositorPlayer();
+    ASSERT(compositorPlayer);
+    compositorPlayer->removeAnimation(id);
+#else
     toRenderBoxModelObject(element.renderer())->layer()->compositedLayerMapping()->mainGraphicsLayer()->removeAnimation(id);
+#endif
 }
 
-void CompositorAnimations::pauseAnimationForTestingOnCompositor(const Element& element, int id, double pauseTime)
+void CompositorAnimations::pauseAnimationForTestingOnCompositor(const Element& element, const AnimationPlayer* player, int id, double pauseTime)
 {
     // FIXME: canStartAnimationOnCompositor queries compositingState, which is not necessarily up to date.
     // https://code.google.com/p/chromium/issues/detail?id=339847
@@ -307,7 +325,14 @@ void CompositorAnimations::pauseAnimationForTestingOnCompositor(const Element& e
         ASSERT_NOT_REACHED();
         return;
     }
+#if HEAVISIDE_ANIMATIONS
+    ASSERT(player);
+    WebCompositorAnimationPlayer* compositorPlayer = player->compositorPlayer();
+    ASSERT(compositorPlayer);
+    compositorPlayer->pauseAnimation(id, pauseTime);
+#else
     toRenderBoxModelObject(element.renderer())->layer()->compositedLayerMapping()->mainGraphicsLayer()->pauseAnimation(id, pauseTime);
+#endif
 }
 
 // -----------------------------------------------------------------------