diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-08 05:54:11 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-08 05:54:11 +0000 |
| commit | a9c7b2e76a331dbbe53ca102df2d86be1e8b53cd (patch) | |
| tree | 48031bf37c94612084be25bc15c86a3bb00e064d /webkit/compositor_bindings/WebAnimationCurveCommon.cpp | |
| parent | 362591a2da8a5abe42ee51dfea08d1b355c56fc8 (diff) | |
| download | chromium_src-a9c7b2e76a331dbbe53ca102df2d86be1e8b53cd.zip chromium_src-a9c7b2e76a331dbbe53ca102df2d86be1e8b53cd.tar.gz chromium_src-a9c7b2e76a331dbbe53ca102df2d86be1e8b53cd.tar.bz2 | |
[cc] Use base ptr types for cc's CSS animation classes
BUG=154451
Review URL: https://chromiumcodereview.appspot.com/11078009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160630 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/compositor_bindings/WebAnimationCurveCommon.cpp')
| -rw-r--r-- | webkit/compositor_bindings/WebAnimationCurveCommon.cpp | 9 |
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 |