Index: third_party/WebKit/Source/platform/scroll/ProgrammaticScrollAnimator.cpp |
diff --git a/third_party/WebKit/Source/platform/scroll/ProgrammaticScrollAnimator.cpp b/third_party/WebKit/Source/platform/scroll/ProgrammaticScrollAnimator.cpp |
index 1b38d83386404d7dbe36663be07c3d6737875250..3798db75b47f8aaf13af9e528628d1efde7c7b9f 100644 |
--- a/third_party/WebKit/Source/platform/scroll/ProgrammaticScrollAnimator.cpp |
+++ b/third_party/WebKit/Source/platform/scroll/ProgrammaticScrollAnimator.cpp |
@@ -4,13 +4,14 @@ |
#include "platform/scroll/ProgrammaticScrollAnimator.h" |
+#include "platform/CompositorFactory.h" |
+#include "platform/animation/WebCompositorAnimation.h" |
+#include "platform/animation/WebScrollOffsetAnimationCurve.h" |
#include "platform/geometry/IntPoint.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 "public/platform/WebScrollOffsetAnimationCurve.h" |
namespace blink { |
@@ -51,7 +52,7 @@ void ProgrammaticScrollAnimator::animateToOffset(FloatPoint offset) |
{ |
m_startTime = 0.0; |
m_targetOffset = offset; |
- m_animationCurve = adoptPtr(Platform::current()->compositorSupport()->createScrollOffsetAnimationCurve( |
+ m_animationCurve = adoptPtr(CompositorFactory::current().createScrollOffsetAnimationCurve( |
m_targetOffset, |
WebCompositorAnimationCurve::TimingFunctionTypeEaseInOut, |
WebScrollOffsetAnimationCurve::ScrollDurationDeltaBased)); |
@@ -113,7 +114,7 @@ void ProgrammaticScrollAnimator::updateCompositorAnimations() |
bool sentToCompositor = false; |
if (!m_scrollableArea->shouldScrollOnMainThread()) { |
- OwnPtr<WebCompositorAnimation> animation = adoptPtr(Platform::current()->compositorSupport()->createAnimation(*m_animationCurve, WebCompositorAnimation::TargetPropertyScrollOffset)); |
+ OwnPtr<WebCompositorAnimation> animation = adoptPtr(CompositorFactory::current().createAnimation(*m_animationCurve, WebCompositorAnimation::TargetPropertyScrollOffset)); |
int animationId = animation->id(); |
int animationGroupId = animation->group(); |