| Index: cc/timing_function.h
|
| diff --git a/cc/timing_function.h b/cc/timing_function.h
|
| index 993ab872b5bb2a4cc8b139ad95a5ab712fb4d41a..3d9953930522600b5954221527fc0699fdd62cdf 100644
|
| --- a/cc/timing_function.h
|
| +++ b/cc/timing_function.h
|
| @@ -11,50 +11,50 @@
|
| namespace cc {
|
|
|
| // See http://www.w3.org/TR/css3-transitions/.
|
| -class CCTimingFunction : public CCFloatAnimationCurve {
|
| +class TimingFunction : public FloatAnimationCurve {
|
| public:
|
| - virtual ~CCTimingFunction();
|
| + virtual ~TimingFunction();
|
|
|
| - // Partial implementation of CCFloatAnimationCurve.
|
| + // Partial implementation of FloatAnimationCurve.
|
| virtual double duration() const OVERRIDE;
|
|
|
| protected:
|
| - CCTimingFunction();
|
| + TimingFunction();
|
| };
|
|
|
| -class CCCubicBezierTimingFunction : public CCTimingFunction {
|
| +class CubicBezierTimingFunction : public TimingFunction {
|
| public:
|
| - static scoped_ptr<CCCubicBezierTimingFunction> create(double x1, double y1, double x2, double y2);
|
| - virtual ~CCCubicBezierTimingFunction();
|
| + static scoped_ptr<CubicBezierTimingFunction> create(double x1, double y1, double x2, double y2);
|
| + virtual ~CubicBezierTimingFunction();
|
|
|
| - // Partial implementation of CCFloatAnimationCurve.
|
| + // Partial implementation of FloatAnimationCurve.
|
| virtual float getValue(double time) const OVERRIDE;
|
| - virtual scoped_ptr<CCAnimationCurve> clone() const OVERRIDE;
|
| + virtual scoped_ptr<AnimationCurve> clone() const OVERRIDE;
|
|
|
| protected:
|
| - CCCubicBezierTimingFunction(double x1, double y1, double x2, double y2);
|
| + CubicBezierTimingFunction(double x1, double y1, double x2, double y2);
|
|
|
| UnitBezier m_curve;
|
| };
|
|
|
| -class CCEaseTimingFunction {
|
| +class EaseTimingFunction {
|
| public:
|
| - static scoped_ptr<CCTimingFunction> create();
|
| + static scoped_ptr<TimingFunction> create();
|
| };
|
|
|
| -class CCEaseInTimingFunction {
|
| +class EaseInTimingFunction {
|
| public:
|
| - static scoped_ptr<CCTimingFunction> create();
|
| + static scoped_ptr<TimingFunction> create();
|
| };
|
|
|
| -class CCEaseOutTimingFunction {
|
| +class EaseOutTimingFunction {
|
| public:
|
| - static scoped_ptr<CCTimingFunction> create();
|
| + static scoped_ptr<TimingFunction> create();
|
| };
|
|
|
| -class CCEaseInOutTimingFunction {
|
| +class EaseInOutTimingFunction {
|
| public:
|
| - static scoped_ptr<CCTimingFunction> create();
|
| + static scoped_ptr<TimingFunction> create();
|
| };
|
|
|
| } // namespace cc
|
|
|