| Index: third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm
|
| diff --git a/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm b/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm
|
| index 85c5c6dcc4010049eacbe4ba5aeb84306ff028d9..e148eca59fb31776dc78191426efd8296ad1b155 100644
|
| --- a/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm
|
| +++ b/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm
|
| @@ -39,7 +39,8 @@
|
| #include "public/platform/Platform.h"
|
| #include "public/platform/WebScheduler.h"
|
| #include "wtf/MathExtras.h"
|
| -#include "wtf/PassOwnPtr.h"
|
| +#include "wtf/PtrUtil.h"
|
| +#include <memory>
|
|
|
| using namespace blink;
|
|
|
| @@ -354,7 +355,7 @@ private:
|
|
|
| @interface BlinkScrollbarPartAnimation : NSObject {
|
| Scrollbar* _scrollbar;
|
| - OwnPtr<BlinkScrollbarPartAnimationTimer> _timer;
|
| + std::unique_ptr<BlinkScrollbarPartAnimationTimer> _timer;
|
| RetainPtr<ScrollbarPainter> _scrollbarPainter;
|
| FeatureToAnimate _featureToAnimate;
|
| CGFloat _startValue;
|
| @@ -371,7 +372,7 @@ private:
|
| if (!self)
|
| return nil;
|
|
|
| - _timer = adoptPtr(new BlinkScrollbarPartAnimationTimer(self, duration));
|
| + _timer = wrapUnique(new BlinkScrollbarPartAnimationTimer(self, duration));
|
| _scrollbar = scrollbar;
|
| _featureToAnimate = featureToAnimate;
|
| _startValue = startValue;
|
| @@ -682,7 +683,7 @@ ScrollAnimatorMac::ScrollAnimatorMac(ScrollableArea* scrollableArea)
|
| : ScrollAnimatorBase(scrollableArea)
|
| , m_initialScrollbarPaintTaskFactory(CancellableTaskFactory::create(this, &ScrollAnimatorMac::initialScrollbarPaintTask))
|
| , m_sendContentAreaScrolledTaskFactory(CancellableTaskFactory::create(this, &ScrollAnimatorMac::sendContentAreaScrolledTask))
|
| - , m_taskRunner(adoptPtr(Platform::current()->currentThread()->scheduler()->timerTaskRunner()->clone()))
|
| + , m_taskRunner(wrapUnique(Platform::current()->currentThread()->scheduler()->timerTaskRunner()->clone()))
|
| , m_haveScrolledSincePageLoad(false)
|
| , m_needsScrollerStyleUpdate(false)
|
| {
|
|
|