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

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

Index: third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
index 142b27e77d62f5646402360ceea8281f46b330ca..7b29e269dab75b56ef211bf094ff8cf10d6b2fb7 100644
--- a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
+++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
@@ -4,12 +4,15 @@
 
 #include "platform/scroll/ScrollAnimatorCompositorCoordinator.h"
 
+#include "cc/animation/animation_player.h"

[jbroman, 2016/02/01 15:44:36]

Are cc includes needed here?

[loyso (OOO), 2016/02/04 05:49:29]

I wanted to use forward declaration of cc::AnimationPlayer/Timeline for
blink::CompositorAnimationPlayer/CompositorAnimationTimeline (surprisingly,
clang and gcc tolerate scoped_refptr for a forward-declared class with intrusive
refcounted base). MSVC doesn't tolerate that, so it forces one to include CC's
AnimationPlayer header if you include CompositorAnimationPlayer.h.

That's weird. Let's include full headers then. Must work ok.

+#include "cc/animation/animation_timeline.h"
+#include "platform/CompositorFactory.h"
 #include "platform/RuntimeEnabledFeatures.h"
+#include "platform/animation/CompositorAnimationPlayer.h"
+#include "platform/animation/CompositorAnimationTimeline.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/scroll/ScrollableArea.h"
 #include "public/platform/Platform.h"
-#include "public/platform/WebCompositorAnimationPlayer.h"
-#include "public/platform/WebCompositorAnimationTimeline.h"
 #include "public/platform/WebCompositorSupport.h"
 
 namespace blink {
@@ -22,7 +25,7 @@ ScrollAnimatorCompositorCoordinator::ScrollAnimatorCompositorCoordinator()
 {
     if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled()) {
         ASSERT(Platform::current()->compositorSupport());
-        m_compositorPlayer = adoptPtr(Platform::current()->compositorSupport()->createAnimationPlayer());
+        m_compositorPlayer = adoptPtr(CompositorFactory::current().createAnimationPlayer());
         ASSERT(m_compositorPlayer);
         m_compositorPlayer->setAnimationDelegate(this);
     }
@@ -60,7 +63,7 @@ bool ScrollAnimatorCompositorCoordinator::hasAnimationThatRequiresService() cons
 }
 
 bool ScrollAnimatorCompositorCoordinator::addAnimation(
-    PassOwnPtr<WebCompositorAnimation> animation)
+    PassOwnPtr<CompositorAnimation> animation)
 {
     if (m_compositorPlayer) {
         if (m_compositorPlayer->isLayerAttached()) {
@@ -145,7 +148,7 @@ void ScrollAnimatorCompositorCoordinator::compositorAnimationFinished(
 }
 
 void ScrollAnimatorCompositorCoordinator::reattachCompositorPlayerIfNeeded(
-    WebCompositorAnimationTimeline* timeline)
+    CompositorAnimationTimeline* timeline)
 {
     int compositorAnimationAttachedToLayerId = 0;
     if (scrollableArea()->layerForScrolling())
@@ -190,7 +193,7 @@ void ScrollAnimatorCompositorCoordinator::notifyAnimationAborted(
     notifyCompositorAnimationFinished(group);
 }
 
-WebCompositorAnimationPlayer* ScrollAnimatorCompositorCoordinator::compositorPlayer() const
+CompositorAnimationPlayer* ScrollAnimatorCompositorCoordinator::compositorPlayer() const
 {
     return m_compositorPlayer.get();
 }