CC Animation: Move files from cc_blink to Source/platform/animation

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
  *     documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
  * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "platform/graphics/GraphicsLayer.h"
 
 #include "platform/RuntimeEnabledFeatures.h"
+#include "platform/animation/CompositorAnimationPlayer.h"
+#include "platform/animation/CompositorAnimationPlayerClient.h"
+#include "platform/animation/CompositorAnimationTimeline.h"
+#include "platform/animation/CompositorFloatAnimationCurve.h"
+#include "platform/graphics/CompositorFactory.h"
 #include "platform/scroll/ScrollableArea.h"
 #include "platform/transforms/Matrix3DTransformOperation.h"
 #include "platform/transforms/RotateTransformOperation.h"
 #include "platform/transforms/TranslateTransformOperation.h"
 #include "public/platform/Platform.h"
-#include "public/platform/WebCompositorAnimationPlayer.h"
-#include "public/platform/WebCompositorAnimationPlayerClient.h"
-#include "public/platform/WebCompositorAnimationTimeline.h"
 #include "public/platform/WebCompositorSupport.h"
-#include "public/platform/WebFloatAnimationCurve.h"
 #include "public/platform/WebGraphicsContext3D.h"
 #include "public/platform/WebLayer.h"
 #include "public/platform/WebLayerTreeView.h"
 #include "public/platform/WebUnitTestSupport.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/PassOwnPtr.h"
 
 namespace blink {
 
 namespace {
@@ skipping 45 matching lines @@
     WebLayer* m_platformLayer;
     OwnPtr<GraphicsLayerForTesting> m_graphicsLayer;
     OwnPtr<GraphicsLayerForTesting> m_scrollElasticityLayer;
     OwnPtr<GraphicsLayerForTesting> m_clipLayer;
 
 private:
     OwnPtr<WebLayerTreeView> m_layerTreeView;
     MockGraphicsLayerClient m_client;
 };
 
-class AnimationPlayerForTesting : public WebCompositorAnimationPlayerClient {
+class AnimationPlayerForTesting : public CompositorAnimationPlayerClient {
 public:
     AnimationPlayerForTesting()
     {
-        m_compositorPlayer = adoptPtr(Platform::current()->compositorSupport()->createAnimationPlayer());
+        m_compositorPlayer = adoptPtr(CompositorFactory::current().createAnimationPlayer());
     }
 
-    WebCompositorAnimationPlayer* compositorPlayer() const override
+    CompositorAnimationPlayer* compositorPlayer() const override
     {
         return m_compositorPlayer.get();
     }
 
-    OwnPtr<WebCompositorAnimationPlayer> m_compositorPlayer;
+    OwnPtr<CompositorAnimationPlayer> m_compositorPlayer;
 };
 
 TEST_F(GraphicsLayerTest, updateLayerShouldFlattenTransformWithAnimations)
 {
     ASSERT_FALSE(m_platformLayer->hasActiveAnimation());
 
-    OwnPtr<WebFloatAnimationCurve> curve = adoptPtr(Platform::current()->compositorSupport()->createFloatAnimationCurve());
-    curve->add(WebFloatKeyframe(0.0, 0.0));
-    OwnPtr<WebCompositorAnimation> floatAnimation(adoptPtr(Platform::current()->compositorSupport()->createAnimation(*curve, WebCompositorAnimation::TargetPropertyOpacity)));
+    OwnPtr<CompositorFloatAnimationCurve> curve = adoptPtr(CompositorFactory::current().createFloatAnimationCurve());
+    curve->add(CompositorFloatKeyframe(0.0, 0.0));
+    OwnPtr<CompositorAnimation> floatAnimation(adoptPtr(CompositorFactory::current().createAnimation(*curve, CompositorAnimation::TargetPropertyOpacity)));
     int animationId = floatAnimation->id();
 
     if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled()) {
-        OwnPtr<WebCompositorAnimationTimeline> compositorTimeline = adoptPtr(Platform::current()->compositorSupport()->createAnimationTimeline());
+        OwnPtr<CompositorAnimationTimeline> compositorTimeline = adoptPtr(CompositorFactory::current().createAnimationTimeline());
         AnimationPlayerForTesting player;
 
-        layerTreeView()->attachCompositorAnimationTimeline(compositorTimeline.get());
+        layerTreeView()->attachCompositorAnimationTimeline(compositorTimeline->animationTimeline());
         compositorTimeline->playerAttached(player);
 
         player.compositorPlayer()->attachLayer(m_platformLayer);
         ASSERT_TRUE(player.compositorPlayer()->isLayerAttached());
 
         player.compositorPlayer()->addAnimation(floatAnimation.leakPtr());
 
         ASSERT_TRUE(m_platformLayer->hasActiveAnimation());
 
         m_graphicsLayer->setShouldFlattenTransform(false);
 
         m_platformLayer = m_graphicsLayer->platformLayer();
         ASSERT_TRUE(m_platformLayer);
 
         ASSERT_TRUE(m_platformLayer->hasActiveAnimation());
         player.compositorPlayer()->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());
 
         player.compositorPlayer()->detachLayer();
         ASSERT_FALSE(player.compositorPlayer()->isLayerAttached());
 
         compositorTimeline->playerDestroyed(player);
-        layerTreeView()->detachCompositorAnimationTimeline(compositorTimeline.get());
+        layerTreeView()->detachCompositorAnimationTimeline(compositorTimeline->animationTimeline());
     } else {
-        ASSERT_TRUE(m_platformLayer->addAnimation(floatAnimation.leakPtr()));
+        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);
@@ skipping 56 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