| Index: third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
|
| diff --git a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
|
| index 1d58966e8e2a1064ab64e156e5355ffdc1d45e2c..bad7f3d75a40b79f26533059789c56604bbceffd 100644
|
| --- a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
|
| +++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
|
| @@ -14,6 +14,8 @@
|
| #include "platform/scroll/ScrollableArea.h"
|
| #include "public/platform/Platform.h"
|
| #include "public/platform/WebCompositorSupport.h"
|
| +#include "wtf/PtrUtil.h"
|
| +#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -25,7 +27,7 @@ ScrollAnimatorCompositorCoordinator::ScrollAnimatorCompositorCoordinator()
|
| , m_implOnlyAnimationTakeover(false)
|
| {
|
| ThreadState::current()->registerPreFinalizer(this);
|
| - m_compositorPlayer = adoptPtr(CompositorFactory::current().createAnimationPlayer());
|
| + m_compositorPlayer = wrapUnique(CompositorFactory::current().createAnimationPlayer());
|
| ASSERT(m_compositorPlayer);
|
| m_compositorPlayer->setAnimationDelegate(this);
|
| }
|
| @@ -76,10 +78,10 @@ bool ScrollAnimatorCompositorCoordinator::hasAnimationThatRequiresService() cons
|
| }
|
|
|
| bool ScrollAnimatorCompositorCoordinator::addAnimation(
|
| - PassOwnPtr<CompositorAnimation> animation)
|
| + std::unique_ptr<CompositorAnimation> animation)
|
| {
|
| if (m_compositorPlayer->isLayerAttached()) {
|
| - m_compositorPlayer->addAnimation(animation.leakPtr());
|
| + m_compositorPlayer->addAnimation(animation.release());
|
| return true;
|
| }
|
| return false;
|
|
|