Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(28)

Unified Diff: webkit/compositor_bindings/WebAnimationCurveCommon.cpp

Issue 11086053: Revert 161133 - [cc] Use base ptr types for cc's CSS animation classes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/compositor_bindings/WebAnimationCurveCommon.h ('k') | webkit/compositor_bindings/WebAnimationImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « webkit/compositor_bindings/WebAnimationCurveCommon.h ('k') | webkit/compositor_bindings/WebAnimationImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698