| 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 101a0e061990e428ba1bd2f850e7348513f042f7..e48c774abd74d0349bdb5c13c807eed9d6c0c986 100644
|
| --- a/third_party/WebKit/Source/platform/scroll/ProgrammaticScrollAnimator.cpp
|
| +++ b/third_party/WebKit/Source/platform/scroll/ProgrammaticScrollAnimator.cpp
|
| @@ -12,6 +12,8 @@
|
| #include "platform/scroll/ScrollableArea.h"
|
| #include "public/platform/Platform.h"
|
| #include "public/platform/WebCompositorSupport.h"
|
| +#include "wtf/PtrUtil.h"
|
| +#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -50,7 +52,7 @@ void ProgrammaticScrollAnimator::animateToOffset(FloatPoint offset)
|
|
|
| m_startTime = 0.0;
|
| m_targetOffset = offset;
|
| - m_animationCurve = adoptPtr(CompositorFactory::current().createScrollOffsetAnimationCurve(
|
| + m_animationCurve = wrapUnique(CompositorFactory::current().createScrollOffsetAnimationCurve(
|
| compositorOffsetFromBlinkOffset(m_targetOffset),
|
| CompositorScrollOffsetAnimationCurve::ScrollDurationDeltaBased));
|
|
|
| @@ -121,7 +123,7 @@ void ProgrammaticScrollAnimator::updateCompositorAnimations()
|
| bool sentToCompositor = false;
|
|
|
| if (!m_scrollableArea->shouldScrollOnMainThread()) {
|
| - OwnPtr<CompositorAnimation> animation = adoptPtr(CompositorFactory::current().createAnimation(*m_animationCurve, CompositorTargetProperty::SCROLL_OFFSET));
|
| + std::unique_ptr<CompositorAnimation> animation = wrapUnique(CompositorFactory::current().createAnimation(*m_animationCurve, CompositorTargetProperty::SCROLL_OFFSET));
|
|
|
| int animationId = animation->id();
|
| int animationGroupId = animation->group();
|
|
|