Animations: Introduce compositor AnimationPlayer and AnimationTimeline.

Source/core/animation/CompositorAnimations.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 25 matching lines @@
 #include "core/animation/ElementAnimations.h"
 #include "core/animation/CompositorAnimationsImpl.h"
 #include "core/animation/animatable/AnimatableDouble.h"
 #include "core/animation/animatable/AnimatableFilterOperations.h"
 #include "core/animation/animatable/AnimatableTransform.h"
 #include "core/animation/animatable/AnimatableValue.h"
 #include "core/layout/Layer.h"
 #include "core/layout/LayoutBoxModelObject.h"
 #include "core/layout/LayoutObject.h"
 #include "core/layout/compositing/CompositedLayerMapping.h"
+#include "platform/RuntimeEnabledFeatures.h"
 #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"
 #include "public/platform/WebFloatAnimationCurve.h"
 #include "public/platform/WebFloatKeyframe.h"
 #include "public/platform/WebTransformAnimationCurve.h"
 #include "public/platform/WebTransformKeyframe.h"
 
 #include <algorithm>
 #include <cmath>
@@ skipping 194 matching lines @@
             || (affectsFilter && attachedPlayer->affects(targetElement, CSSPropertyWebkitFilter)))
             attachedPlayer->cancelAnimationOnCompositor();
     }
 }
 
 bool CompositorAnimations::canStartAnimationOnCompositor(const Element& element)
 {
     return element.layoutObject() && element.layoutObject()->compositingState() == PaintsIntoOwnBacking;
 }
 
-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)
+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());
-    ASSERT(isCandidateForAnimationOnCompositor(timing, element, player, effect, playerPlaybackRate));
+    ASSERT(isCandidateForAnimationOnCompositor(timing, element, &player, effect, playerPlaybackRate));
     ASSERT(canStartAnimationOnCompositor(element));
 
     const KeyframeEffectModelBase& keyframeEffect = toKeyframeEffectModelBase(effect);
 
     Layer* layer = toLayoutBoxModelObject(element.layoutObject())->layer();
     ASSERT(layer);
 
     Vector<OwnPtr<WebCompositorAnimation>> animations;
     CompositorAnimationsImpl::getAnimationOnCompositor(timing, group, startTime, timeOffset, keyframeEffect, animations, playerPlaybackRate);
     ASSERT(!animations.isEmpty());
     for (auto& animation : animations) {
         int id = animation->id();
-        if (!layer->compositedLayerMapping()->mainGraphicsLayer()->addAnimation(animation.release())) {
+        if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled()) {
+            WebCompositorAnimationPlayer* compositorPlayer = player.compositorPlayer();
+            ASSERT(compositorPlayer);
+            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;
         }
         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
         // AnimationPlayers for CSS animations. But by the time we get
         // here the mapping will have been removed.
         // FIXME: Defer remove/pause operations until after the
         // compositing update.
         return;
     }
-    toLayoutBoxModelObject(element.layoutObject())->layer()->compositedLayerMapping()->mainGraphicsLayer()->removeAnimation(id);
+    if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled()) {
+        WebCompositorAnimationPlayer* compositorPlayer = player.compositorPlayer();
+        ASSERT(compositorPlayer);
+        compositorPlayer->removeAnimation(id);
+    } else {
+        toLayoutBoxModelObject(element.layoutObject())->layer()->compositedLayerMapping()->mainGraphicsLayer()->removeAnimation(id);
+    }
 }
 
-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
     DisableCompositingQueryAsserts disabler;
 
     if (!canStartAnimationOnCompositor(element)) {
         ASSERT_NOT_REACHED();
         return;
     }
-    toLayoutBoxModelObject(element.layoutObject())->layer()->compositedLayerMapping()->mainGraphicsLayer()->pauseAnimation(id, pauseTime);
+    if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled()) {
+        WebCompositorAnimationPlayer* compositorPlayer = player.compositorPlayer();
+        ASSERT(compositorPlayer);
+        compositorPlayer->pauseAnimation(id, pauseTime);
+    } else {
+        toLayoutBoxModelObject(element.layoutObject())->layer()->compositedLayerMapping()->mainGraphicsLayer()->pauseAnimation(id, pauseTime);
+    }
+}
+
+bool CompositorAnimations::canAttachCompositedLayers(const Element& element, const AnimationPlayer& player)
+{
+    if (!RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled())
+        return false;
+
+    if (!player.compositorPlayer())
+        return false;
+
+    if (!element.layoutObject() || !element.layoutObject()->isBoxModelObject())
+        return false;
+
+    Layer* layer = toLayoutBoxModelObject(element.layoutObject())->layer();
+
+    if (!layer || !layer->isAllowedToQueryCompositingState() || !layer->compositedLayerMapping() || !layer->compositedLayerMapping()->mainGraphicsLayer())

[dstockwell, 2015/03/26 03:04:39]

I think isAllowedToQueryCompositingState being false means we're calling this at
the wrong time.

[loyso (OOO), 2015/03/26 23:36:14]

It allows us to defer the actual attachment.

+        return false;
+
+    if (!layer->compositedLayerMapping()->mainGraphicsLayer()->platformLayer())
+        return false;
+
+    return true;
+}
+
+void CompositorAnimations::attachCompositedLayers(const Element& element, const AnimationPlayer& player)
+{
+    ASSERT(element.layoutObject());
+
+    Layer* layer = toLayoutBoxModelObject(element.layoutObject())->layer();
+    ASSERT(layer);
+
+    WebCompositorAnimationPlayer* compositorPlayer = player.compositorPlayer();
+    ASSERT(compositorPlayer);
+
+    ASSERT(layer->compositedLayerMapping());
+    compositorPlayer->attachLayer(layer->compositedLayerMapping()->mainGraphicsLayer()->platformLayer());
 }
 
 // -----------------------------------------------------------------------
 // CompositorAnimationsImpl
 // -----------------------------------------------------------------------
 
 bool CompositorAnimationsImpl::convertTimingForCompositor(const Timing& timing, double timeOffset, CompositorTiming& out, double playerPlaybackRate)
 {
     timing.assertValid();
 
@@ skipping 295 matching lines @@
             break;
         default:
             ASSERT_NOT_REACHED();
         }
         animations.append(animation.release());
     }
     ASSERT(!animations.isEmpty());
 }
 
 } // namespace blink