| Index: webkit/compositor_bindings/WebAnimationCurveCommon.cpp
|
| ===================================================================
|
| --- webkit/compositor_bindings/WebAnimationCurveCommon.cpp (revision 161134)
|
| +++ webkit/compositor_bindings/WebAnimationCurveCommon.cpp (working copy)
|
| @@ -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 @@
|
| 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
|
|
|