| 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..36df274ba1450bc40bf12c6a8b2962d339190076 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/WebCompositorAnimation.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,20 +225,19 @@ 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,
|
| + WebCompositorAnimationCurve::TimingFunctionTypeEaseInOut,
|
| + m_lastGranularity == ScrollByPixel ?
|
| + WebScrollOffsetAnimationCurve::ScrollDurationInverseDelta :
|
| + WebScrollOffsetAnimationCurve::ScrollDurationConstant));
|
| m_animationCurve->setInitialValue(currentPosition());
|
| }
|
|
|
| bool sentToCompositor = false;
|
| if (!m_scrollableArea->shouldScrollOnMainThread()) {
|
| OwnPtr<WebCompositorAnimation> animation = adoptPtr(
|
| - Platform::current()->compositorSupport()->createAnimation(
|
| + CompositorFactory::current().createAnimation(
|
| *m_animationCurve,
|
| WebCompositorAnimation::TargetPropertyScrollOffset));
|
| // Being here means that either there is an animation that needs
|
|
|