Index: third_party/WebKit/Source/platform/animation/CompositorFloatAnimationCurve.cpp |
diff --git a/third_party/WebKit/Source/platform/animation/CompositorFloatAnimationCurve.cpp b/third_party/WebKit/Source/platform/animation/CompositorFloatAnimationCurve.cpp |
index 5c6a461cf8e889317d2e0c1322dac4abb4212e80..47fd8dac45eca42fe0953c5bd9292641ed9bf3d4 100644 |
--- a/third_party/WebKit/Source/platform/animation/CompositorFloatAnimationCurve.cpp |
+++ b/third_party/WebKit/Source/platform/animation/CompositorFloatAnimationCurve.cpp |
@@ -7,8 +7,6 @@ |
#include "cc/animation/animation_curve.h" |
#include "cc/animation/keyframed_animation_curve.h" |
#include "cc/animation/timing_function.h" |
-#include "wtf/PtrUtil.h" |
-#include <memory> |
using blink::CompositorFloatKeyframe; |
@@ -28,9 +26,9 @@ CompositorFloatAnimationCurve::~CompositorFloatAnimationCurve() |
{ |
} |
-std::unique_ptr<CompositorFloatAnimationCurve> CompositorFloatAnimationCurve::CreateForTesting(std::unique_ptr<cc::KeyframedFloatAnimationCurve> curve) |
+PassOwnPtr<CompositorFloatAnimationCurve> CompositorFloatAnimationCurve::CreateForTesting(std::unique_ptr<cc::KeyframedFloatAnimationCurve> curve) |
{ |
- return wrapUnique(new CompositorFloatAnimationCurve(std::move(curve))); |
+ return adoptPtr(new CompositorFloatAnimationCurve(std::move(curve))); |
} |
Vector<CompositorFloatKeyframe> CompositorFloatAnimationCurve::keyframesForTesting() const |