Index: third_party/WebKit/Source/platform/animation/CompositorFloatAnimationCurve.h |
diff --git a/third_party/WebKit/Source/platform/animation/CompositorFloatAnimationCurve.h b/third_party/WebKit/Source/platform/animation/CompositorFloatAnimationCurve.h |
index 2ddc495942572435a8d4257184890342baae9c2e..69340ce3871e791a422d4562318a1475e560b622 100644 |
--- a/third_party/WebKit/Source/platform/animation/CompositorFloatAnimationCurve.h |
+++ b/third_party/WebKit/Source/platform/animation/CompositorFloatAnimationCurve.h |
@@ -10,8 +10,9 @@ |
#include "platform/animation/CompositorFloatKeyframe.h" |
#include "platform/animation/TimingFunction.h" |
#include "wtf/Noncopyable.h" |
-#include "wtf/PassOwnPtr.h" |
+#include "wtf/PtrUtil.h" |
#include "wtf/Vector.h" |
+#include <memory> |
namespace cc { |
class KeyframedFloatAnimationCurve; |
@@ -27,14 +28,14 @@ namespace blink { |
class PLATFORM_EXPORT CompositorFloatAnimationCurve : public CompositorAnimationCurve { |
WTF_MAKE_NONCOPYABLE(CompositorFloatAnimationCurve); |
public: |
- static PassOwnPtr<CompositorFloatAnimationCurve> create() |
+ static std::unique_ptr<CompositorFloatAnimationCurve> create() |
{ |
- return adoptPtr(new CompositorFloatAnimationCurve()); |
+ return wrapUnique(new CompositorFloatAnimationCurve()); |
} |
~CompositorFloatAnimationCurve() override; |
- static PassOwnPtr<CompositorFloatAnimationCurve> CreateForTesting(std::unique_ptr<cc::KeyframedFloatAnimationCurve>); |
+ static std::unique_ptr<CompositorFloatAnimationCurve> CreateForTesting(std::unique_ptr<cc::KeyframedFloatAnimationCurve>); |
Vector<CompositorFloatKeyframe> keyframesForTesting() const; |
// TODO(loyso): Erase these methods once blink/cc timing functions unified. |