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

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

Index: third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp
index f0e32bf0aac4449d93e7cd246539743bd417ee8d..be108bed3e9da126143a5bbaf1a573c520528beb 100644
--- a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp
+++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp
@@ -29,9 +29,12 @@
 #include "SkMatrix44.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/layers/layer.h"
+#include "platform/CompositorFactory.h"
 #include "platform/DragImage.h"
 #include "platform/JSONValues.h"
 #include "platform/TraceEvent.h"
+#include "platform/animation/WebCompositorAnimation.h"
+#include "platform/animation/WebFilterOperations.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/geometry/LayoutRect.h"
 #include "platform/graphics/BitmapImage.h"
@@ -46,9 +49,7 @@
 #include "platform/scroll/ScrollableArea.h"
 #include "platform/text/TextStream.h"
 #include "public/platform/Platform.h"
-#include "public/platform/WebCompositorAnimation.h"
 #include "public/platform/WebCompositorSupport.h"
-#include "public/platform/WebFilterOperations.h"
 #include "public/platform/WebFloatPoint.h"
 #include "public/platform/WebFloatRect.h"
 #include "public/platform/WebLayer.h"
@@ -1114,12 +1115,11 @@ void GraphicsLayer::setContentsToImage(Image* image, RespectImageOrientationEnum
     setContentsTo(m_imageLayer ? m_imageLayer->layer() : 0);
 }
 
-bool GraphicsLayer::addAnimation(PassOwnPtr<WebCompositorAnimation> popAnimation)
+bool GraphicsLayer::addAnimation(PassOwnPtr<WebCompositorAnimation> animation)
 {
-    OwnPtr<WebCompositorAnimation> animation(std::move(popAnimation));
     ASSERT(animation);
     platformLayer()->setAnimationDelegate(this);
-    return platformLayer()->addAnimation(animation.leakPtr());
+    return platformLayer()->addAnimation(animation->releaseCCAnimation());
 }
 
 void GraphicsLayer::pauseAnimation(int animationId, double timeOffset)
@@ -1145,17 +1145,17 @@ WebLayer* GraphicsLayer::platformLayer() const
 void GraphicsLayer::setFilters(const FilterOperations& filters)
 {
     SkiaImageFilterBuilder builder;
-    OwnPtr<WebFilterOperations> webFilters = adoptPtr(Platform::current()->compositorSupport()->createFilterOperations());
+    OwnPtr<WebFilterOperations> webFilters = adoptPtr(CompositorFactory::current().createFilterOperations());
     builder.buildFilterOperations(filters, webFilters.get());
-    m_layer->layer()->setFilters(*webFilters);
+    m_layer->layer()->setFilters(webFilters->AsFilterOperations());
 }
 
 void GraphicsLayer::setBackdropFilters(const FilterOperations& filters)
 {
     SkiaImageFilterBuilder builder;
-    OwnPtr<WebFilterOperations> webFilters = adoptPtr(Platform::current()->compositorSupport()->createFilterOperations());
+    OwnPtr<WebFilterOperations> webFilters = adoptPtr(CompositorFactory::current().createFilterOperations());
     builder.buildFilterOperations(filters, webFilters.get());
-    m_layer->layer()->setBackgroundFilters(*webFilters);
+    m_layer->layer()->setBackgroundFilters(webFilters->AsFilterOperations());
 }
 
 void GraphicsLayer::setFilterQuality(SkFilterQuality filterQuality)