Index: third_party/WebKit/Source/platform/animation/CompositorScrollOffsetAnimationCurve.h |
diff --git a/third_party/WebKit/Source/platform/animation/CompositorScrollOffsetAnimationCurve.h b/third_party/WebKit/Source/platform/animation/CompositorScrollOffsetAnimationCurve.h |
index af799e3c030d818c468162041d010c3b1cfa880e..fc6a25d77798655b1a43b34a1818a100131321b4 100644 |
--- a/third_party/WebKit/Source/platform/animation/CompositorScrollOffsetAnimationCurve.h |
+++ b/third_party/WebKit/Source/platform/animation/CompositorScrollOffsetAnimationCurve.h |
@@ -9,7 +9,8 @@ |
#include "platform/animation/CompositorAnimationCurve.h" |
#include "platform/geometry/FloatPoint.h" |
#include "wtf/Noncopyable.h" |
-#include "wtf/PassOwnPtr.h" |
+#include "wtf/PtrUtil.h" |
+#include <memory> |
namespace cc { |
class ScrollOffsetAnimationCurve; |
@@ -26,13 +27,13 @@ public: |
ScrollDurationInverseDelta |
}; |
- static PassOwnPtr<CompositorScrollOffsetAnimationCurve> create(FloatPoint targetValue, CompositorScrollOffsetAnimationCurve::ScrollDurationBehavior durationBehavior) |
+ static std::unique_ptr<CompositorScrollOffsetAnimationCurve> create(FloatPoint targetValue, CompositorScrollOffsetAnimationCurve::ScrollDurationBehavior durationBehavior) |
{ |
- return adoptPtr(new CompositorScrollOffsetAnimationCurve(targetValue, durationBehavior)); |
+ return wrapUnique(new CompositorScrollOffsetAnimationCurve(targetValue, durationBehavior)); |
} |
- static PassOwnPtr<CompositorScrollOffsetAnimationCurve> create(cc::ScrollOffsetAnimationCurve* curve) |
+ static std::unique_ptr<CompositorScrollOffsetAnimationCurve> create(cc::ScrollOffsetAnimationCurve* curve) |
{ |
- return adoptPtr(new CompositorScrollOffsetAnimationCurve(curve)); |
+ return wrapUnique(new CompositorScrollOffsetAnimationCurve(curve)); |
} |
~CompositorScrollOffsetAnimationCurve() override; |