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, 3 insertions, 6 deletions
diff --git a/webkit/compositor_bindings/WebAnimationCurveCommon.cpp b/webkit/compositor_bindings/WebAnimationCurveCommon.cpp
index d13750e..2cd5ac2 100644
--- a/webkit/compositor_bindings/WebAnimationCurveCommon.cpp
+++ b/webkit/compositor_bindings/WebAnimationCurveCommon.cpp
@@ -8,12 +8,9 @@
#include "CCTimingFunction.h"
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
-
namespace WebKit {
-PassOwnPtr<cc::CCTimingFunction> createTimingFunction(WebAnimationCurve::TimingFunctionType type)
+scoped_ptr<cc::CCTimingFunction> createTimingFunction(WebAnimationCurve::TimingFunctionType type)
{
switch (type) {
case WebAnimationCurve::TimingFunctionTypeEase:
@@ -25,9 +22,9 @@ PassOwnPtr<cc::CCTimingFunction> createTimingFunction(WebAnimationCurve::TimingF
case WebAnimationCurve::TimingFunctionTypeEaseInOut:
return cc::CCEaseInOutTimingFunction::create();
case WebAnimationCurve::TimingFunctionTypeLinear:
- return nullptr;
+ return scoped_ptr<cc::CCTimingFunction>();
}
- return nullptr;
+ return scoped_ptr<cc::CCTimingFunction>();
}
} // namespace WebKit