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

third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp

Index: third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp b/third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp
index de0000b4a8f5a948cb00f564d08a62014024fb01..2c8fe43118c4a76277389122f5ac60fe725200a6 100644
--- a/third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp
+++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp
@@ -30,11 +30,12 @@
 
 #include "platform/scroll/ScrollAnimator.h"
 
+#include "platform/CompositorFactory.h"
 #include "platform/TraceEvent.h"
+#include "platform/animation/CompositorAnimation.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/scroll/ScrollableArea.h"
 #include "public/platform/Platform.h"
-#include "public/platform/WebCompositorAnimation.h"
 #include "public/platform/WebCompositorSupport.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/PassRefPtr.h"
@@ -224,22 +225,21 @@ void ScrollAnimator::updateCompositorAnimations()
         }
 
         if (!m_animationCurve) {
-            m_animationCurve = adoptPtr(Platform::current()->compositorSupport()
-                ->createScrollOffsetAnimationCurve(
-                    m_targetOffset,
-                    WebCompositorAnimationCurve::TimingFunctionTypeEaseInOut,
-                    m_lastGranularity == ScrollByPixel ?
-                        WebScrollOffsetAnimationCurve::ScrollDurationInverseDelta :
-                        WebScrollOffsetAnimationCurve::ScrollDurationConstant));
+            m_animationCurve = adoptPtr(CompositorFactory::current().createScrollOffsetAnimationCurve(
+                m_targetOffset,
+                CompositorAnimationCurve::TimingFunctionTypeEaseInOut,
+                m_lastGranularity == ScrollByPixel ?
+                    CompositorScrollOffsetAnimationCurve::ScrollDurationInverseDelta :
+                    CompositorScrollOffsetAnimationCurve::ScrollDurationConstant));
             m_animationCurve->setInitialValue(currentPosition());
         }
 
         bool sentToCompositor = false;
         if (!m_scrollableArea->shouldScrollOnMainThread()) {
-            OwnPtr<WebCompositorAnimation> animation = adoptPtr(
-                Platform::current()->compositorSupport()->createAnimation(
+            OwnPtr<CompositorAnimation> animation = adoptPtr(
+                CompositorFactory::current().createAnimation(
                     *m_animationCurve,
-                    WebCompositorAnimation::TargetPropertyScrollOffset));
+                    CompositorAnimation::TargetPropertyScrollOffset));
             // Being here means that either there is an animation that needs
             // to be sent to the compositor, or an animation that needs to
             // be updated (a new scroll event before the previous animation
@@ -284,7 +284,7 @@ void ScrollAnimator::cancelAnimation()
 }
 
 void ScrollAnimator::layerForCompositedScrollingDidChange(
-    WebCompositorAnimationTimeline* timeline)
+    CompositorAnimationTimeline* timeline)
 {
     reattachCompositorPlayerIfNeeded(timeline);
 }