[Sketch] Animations: Torpedo the old intrusive animation system.

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 269 matching lines @@
     const KeyframeEffectModelBase& keyframeEffect = toKeyframeEffectModelBase(effect);
 
     DeprecatedPaintLayer* 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 (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled()) {
-            WebCompositorAnimationPlayer* compositorPlayer = player.compositorPlayer();
-            ASSERT(compositorPlayer);
-            compositorPlayer->addAnimation(animation.leakPtr());
-        } else if (!layer->compositedDeprecatedPaintLayerMapping()->mainGraphicsLayer()->addAnimation(animation.release())) {
-            // FIXME: We should know ahead of time whether these animations can be started.
-            for (int startedAnimationId : startedAnimationIds)
-                cancelAnimationOnCompositor(element, player, startedAnimationId);
-            startedAnimationIds.clear();
-            return false;
-        }
+        WebCompositorAnimationPlayer* compositorPlayer = player.compositorPlayer();
+        ASSERT(compositorPlayer);
+        compositorPlayer->addAnimation(animation.leakPtr());
         startedAnimationIds.append(id);
     }
     ASSERT(!startedAnimationIds.isEmpty());
     return true;
 }
 
 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;
     }
-    if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled()) {
-        WebCompositorAnimationPlayer* compositorPlayer = player.compositorPlayer();
-        ASSERT(compositorPlayer);
-        compositorPlayer->removeAnimation(id);
-    } else {
-        toLayoutBoxModelObject(element.layoutObject())->layer()->compositedDeprecatedPaintLayerMapping()->mainGraphicsLayer()->removeAnimation(id);
-    }
+
+    WebCompositorAnimationPlayer* compositorPlayer = player.compositorPlayer();
+    ASSERT(compositorPlayer);
+    compositorPlayer->removeAnimation(id);
 }
 
 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;
     }
-    if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled()) {
-        WebCompositorAnimationPlayer* compositorPlayer = player.compositorPlayer();
-        ASSERT(compositorPlayer);
-        compositorPlayer->pauseAnimation(id, pauseTime);
-    } else {
-        toLayoutBoxModelObject(element.layoutObject())->layer()->compositedDeprecatedPaintLayerMapping()->mainGraphicsLayer()->pauseAnimation(id, pauseTime);
-    }
+
+    WebCompositorAnimationPlayer* compositorPlayer = player.compositorPlayer();
+    ASSERT(compositorPlayer);
+    compositorPlayer->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;
 
     DeprecatedPaintLayer* layer = toLayoutBoxModelObject(element.layoutObject())->layer();
 
     if (!layer || !layer->isAllowedToQueryCompositingState()
         || !layer->compositedDeprecatedPaintLayerMapping()
@@ skipping 326 matching lines @@
             break;
         default:
             ASSERT_NOT_REACHED();
         }
         animations.append(animation.release());
     }
     ASSERT(!animations.isEmpty());
 }
 
 } // namespace blink