summaryrefslogtreecommitdiffstats
path: root/webkit/compositor_bindings/WebAnimationCurveCommon.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/compositor_bindings/WebAnimationCurveCommon.cpp')
-rw-r--r--webkit/compositor_bindings/WebAnimationCurveCommon.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/webkit/compositor_bindings/WebAnimationCurveCommon.cpp b/webkit/compositor_bindings/WebAnimationCurveCommon.cpp
index 2cd5ac2..d13750e 100644
--- a/webkit/compositor_bindings/WebAnimationCurveCommon.cpp
+++ b/webkit/compositor_bindings/WebAnimationCurveCommon.cpp
@@ -8,9 +8,12 @@
#include "CCTimingFunction.h"
+#include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
+
namespace WebKit {
-scoped_ptr<cc::CCTimingFunction> createTimingFunction(WebAnimationCurve::TimingFunctionType type)
+PassOwnPtr<cc::CCTimingFunction> createTimingFunction(WebAnimationCurve::TimingFunctionType type)
{
switch (type) {
case WebAnimationCurve::TimingFunctionTypeEase:
@@ -22,9 +25,9 @@ scoped_ptr<cc::CCTimingFunction> createTimingFunction(WebAnimationCurve::TimingF
case WebAnimationCurve::TimingFunctionTypeEaseInOut:
return cc::CCEaseInOutTimingFunction::create();
case WebAnimationCurve::TimingFunctionTypeLinear:
- return scoped_ptr<cc::CCTimingFunction>();
+ return nullptr;
}
- return scoped_ptr<cc::CCTimingFunction>();
+ return nullptr;
}
} // namespace WebKit