Blink Compositor Animation: Erase old animation system.

third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp

 /*
  * Copyright (C) 2012 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:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 100 matching lines @@
     CompositorAnimationPlayer* compositorPlayer() const override
     {
         return m_compositorPlayer.get();
     }
 
     OwnPtr<CompositorAnimationPlayer> m_compositorPlayer;
 };
 
 TEST_F(GraphicsLayerTest, updateLayerShouldFlattenTransformWithAnimations)
 {
-    ASSERT_FALSE(m_platformLayer->hasActiveAnimation());
+    ASSERT_FALSE(m_platformLayer->hasActiveAnimationForTesting());
 
     OwnPtr<CompositorFloatAnimationCurve> curve = adoptPtr(CompositorFactory::current().createFloatAnimationCurve());
     curve->add(CompositorFloatKeyframe(0.0, 0.0));
     OwnPtr<CompositorAnimation> floatAnimation(adoptPtr(CompositorFactory::current().createAnimation(*curve, CompositorTargetProperty::OPACITY)));
     int animationId = floatAnimation->id();
 
-    if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled()) {

[Ian Vollick, 2016/02/29 13:21:37]

Can you please remind me how this got enabled during the unit test?

[loyso (OOO), 2016/02/29 22:39:28]

See content/test/test_blink_web_unit_test_support.cc change in this CL.

-        OwnPtr<CompositorAnimationTimeline> compositorTimeline = adoptPtr(CompositorFactory::current().createAnimationTimeline());
-        AnimationPlayerForTesting player;
+    OwnPtr<CompositorAnimationTimeline> compositorTimeline = adoptPtr(CompositorFactory::current().createAnimationTimeline());
+    AnimationPlayerForTesting player;
 
-        layerTreeView()->attachCompositorAnimationTimeline(compositorTimeline->animationTimeline());
-        compositorTimeline->playerAttached(player);
+    layerTreeView()->attachCompositorAnimationTimeline(compositorTimeline->animationTimeline());
+    compositorTimeline->playerAttached(player);
 
-        player.compositorPlayer()->attachLayer(m_platformLayer);
-        ASSERT_TRUE(player.compositorPlayer()->isLayerAttached());
+    player.compositorPlayer()->attachLayer(m_platformLayer);
+    ASSERT_TRUE(player.compositorPlayer()->isLayerAttached());
 
-        player.compositorPlayer()->addAnimation(floatAnimation.leakPtr());
+    player.compositorPlayer()->addAnimation(floatAnimation.leakPtr());
 
-        ASSERT_TRUE(m_platformLayer->hasActiveAnimation());
+    ASSERT_TRUE(m_platformLayer->hasActiveAnimationForTesting());
 
-        m_graphicsLayer->setShouldFlattenTransform(false);
+    m_graphicsLayer->setShouldFlattenTransform(false);
 
-        m_platformLayer = m_graphicsLayer->platformLayer();
-        ASSERT_TRUE(m_platformLayer);
+    m_platformLayer = m_graphicsLayer->platformLayer();
+    ASSERT_TRUE(m_platformLayer);
 
-        ASSERT_TRUE(m_platformLayer->hasActiveAnimation());
-        player.compositorPlayer()->removeAnimation(animationId);
-        ASSERT_FALSE(m_platformLayer->hasActiveAnimation());
+    ASSERT_TRUE(m_platformLayer->hasActiveAnimationForTesting());
+    player.compositorPlayer()->removeAnimation(animationId);
+    ASSERT_FALSE(m_platformLayer->hasActiveAnimationForTesting());
 
-        m_graphicsLayer->setShouldFlattenTransform(true);
+    m_graphicsLayer->setShouldFlattenTransform(true);
 
-        m_platformLayer = m_graphicsLayer->platformLayer();
-        ASSERT_TRUE(m_platformLayer);
+    m_platformLayer = m_graphicsLayer->platformLayer();
+    ASSERT_TRUE(m_platformLayer);
 
-        ASSERT_FALSE(m_platformLayer->hasActiveAnimation());
+    ASSERT_FALSE(m_platformLayer->hasActiveAnimationForTesting());
 
-        player.compositorPlayer()->detachLayer();
-        ASSERT_FALSE(player.compositorPlayer()->isLayerAttached());
+    player.compositorPlayer()->detachLayer();
+    ASSERT_FALSE(player.compositorPlayer()->isLayerAttached());
 
-        compositorTimeline->playerDestroyed(player);
-        layerTreeView()->detachCompositorAnimationTimeline(compositorTimeline->animationTimeline());
-    } else {
-        ASSERT_TRUE(m_platformLayer->addAnimation(floatAnimation->releaseCCAnimation()));
-
-        ASSERT_TRUE(m_platformLayer->hasActiveAnimation());
-
-        m_graphicsLayer->setShouldFlattenTransform(false);
-
-        m_platformLayer = m_graphicsLayer->platformLayer();
-        ASSERT_TRUE(m_platformLayer);
-
-        ASSERT_TRUE(m_platformLayer->hasActiveAnimation());
-        m_platformLayer->removeAnimation(animationId);
-        ASSERT_FALSE(m_platformLayer->hasActiveAnimation());
-
-        m_graphicsLayer->setShouldFlattenTransform(true);
-
-        m_platformLayer = m_graphicsLayer->platformLayer();
-        ASSERT_TRUE(m_platformLayer);
-
-        ASSERT_FALSE(m_platformLayer->hasActiveAnimation());
-    }
+    compositorTimeline->playerDestroyed(player);
+    layerTreeView()->detachCompositorAnimationTimeline(compositorTimeline->animationTimeline());
 }
 
 class FakeScrollableArea : public NoBaseWillBeGarbageCollectedFinalized<FakeScrollableArea>, public ScrollableArea {
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(FakeScrollableArea);
 public:
     static PassOwnPtrWillBeRawPtr<FakeScrollableArea> create()
     {
         return adoptPtrWillBeNoop(new FakeScrollableArea);
     }
 
@@ skipping 37 matching lines @@
 
     WebDoublePoint scrollPosition(7, 9);
     m_platformLayer->setScrollPositionDouble(scrollPosition);
     m_graphicsLayer->didScroll();
 
     EXPECT_FLOAT_EQ(scrollPosition.x, scrollableArea->scrollPositionDouble().x());
     EXPECT_FLOAT_EQ(scrollPosition.y, scrollableArea->scrollPositionDouble().y());
 }
 
 } // namespace blink