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

Unified Diff: cc/animation/timing_function.h

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: rebase Created 4 years, 8 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 | « cc/animation/scroll_offset_animation_curve_unittest.cc ('k') | cc/animation/timing_function.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/animation/timing_function.h
diff --git a/cc/animation/timing_function.h b/cc/animation/timing_function.h
index ddc3c51d95df24169d32a96228ba23487d789180..0953a3974d05ac142d5f382e1f800d246998eb51 100644
--- a/cc/animation/timing_function.h
+++ b/cc/animation/timing_function.h
@@ -5,8 +5,9 @@
#ifndef CC_ANIMATION_TIMING_FUNCTION_H_
#define CC_ANIMATION_TIMING_FUNCTION_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "cc/base/cc_export.h"
#include "ui/gfx/geometry/cubic_bezier.h"
@@ -21,7 +22,7 @@ class CC_EXPORT TimingFunction {
virtual float Velocity(double time) const = 0;
// The smallest and largest values returned by GetValue for inputs in [0, 1].
virtual void Range(float* min, float* max) const = 0;
- virtual scoped_ptr<TimingFunction> Clone() const = 0;
+ virtual std::unique_ptr<TimingFunction> Clone() const = 0;
protected:
TimingFunction();
@@ -32,15 +33,17 @@ class CC_EXPORT TimingFunction {
class CC_EXPORT CubicBezierTimingFunction : public TimingFunction {
public:
- static scoped_ptr<CubicBezierTimingFunction> Create(double x1, double y1,
- double x2, double y2);
+ static std::unique_ptr<CubicBezierTimingFunction> Create(double x1,
+ double y1,
+ double x2,
+ double y2);
~CubicBezierTimingFunction() override;
// TimingFunction implementation.
float GetValue(double time) const override;
float Velocity(double time) const override;
void Range(float* min, float* max) const override;
- scoped_ptr<TimingFunction> Clone() const override;
+ std::unique_ptr<TimingFunction> Clone() const override;
protected:
CubicBezierTimingFunction(double x1, double y1, double x2, double y2);
@@ -53,7 +56,7 @@ class CC_EXPORT CubicBezierTimingFunction : public TimingFunction {
class CC_EXPORT EaseTimingFunction {
public:
- static scoped_ptr<TimingFunction> Create();
+ static std::unique_ptr<TimingFunction> Create();
private:
DISALLOW_IMPLICIT_CONSTRUCTORS(EaseTimingFunction);
@@ -61,7 +64,7 @@ class CC_EXPORT EaseTimingFunction {
class CC_EXPORT EaseInTimingFunction {
public:
- static scoped_ptr<TimingFunction> Create();
+ static std::unique_ptr<TimingFunction> Create();
private:
DISALLOW_IMPLICIT_CONSTRUCTORS(EaseInTimingFunction);
@@ -69,7 +72,7 @@ class CC_EXPORT EaseInTimingFunction {
class CC_EXPORT EaseOutTimingFunction {
public:
- static scoped_ptr<TimingFunction> Create();
+ static std::unique_ptr<TimingFunction> Create();
private:
DISALLOW_IMPLICIT_CONSTRUCTORS(EaseOutTimingFunction);
@@ -77,7 +80,7 @@ class CC_EXPORT EaseOutTimingFunction {
class CC_EXPORT EaseInOutTimingFunction {
public:
- static scoped_ptr<TimingFunction> Create();
+ static std::unique_ptr<TimingFunction> Create();
private:
DISALLOW_IMPLICIT_CONSTRUCTORS(EaseInOutTimingFunction);
@@ -85,12 +88,12 @@ class CC_EXPORT EaseInOutTimingFunction {
class CC_EXPORT StepsTimingFunction : public TimingFunction {
public:
- static scoped_ptr<StepsTimingFunction> Create(int steps,
- float steps_start_offset);
+ static std::unique_ptr<StepsTimingFunction> Create(int steps,
+ float steps_start_offset);
~StepsTimingFunction() override;
float GetValue(double t) const override;
- scoped_ptr<TimingFunction> Clone() const override;
+ std::unique_ptr<TimingFunction> Clone() const override;
void Range(float* min, float* max) const override;
float Velocity(double time) const override;
« no previous file with comments | « cc/animation/scroll_offset_animation_curve_unittest.cc ('k') | cc/animation/timing_function.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698