| Index: cc/timing_function.h
|
| diff --git a/cc/timing_function.h b/cc/timing_function.h
|
| index 1150ebaba0db730d428d4552f063c7ef61a82725..4fd029dd22bd76c46d8745a4a2637c791abfd401 100644
|
| --- a/cc/timing_function.h
|
| +++ b/cc/timing_function.h
|
| @@ -13,54 +13,55 @@ namespace cc {
|
|
|
| // See http://www.w3.org/TR/css3-transitions/.
|
| class CC_EXPORT TimingFunction : public FloatAnimationCurve {
|
| -public:
|
| - virtual ~TimingFunction();
|
| + public:
|
| + virtual ~TimingFunction();
|
|
|
| - // Partial implementation of FloatAnimationCurve.
|
| - virtual double duration() const OVERRIDE;
|
| + // Partial implementation of FloatAnimationCurve.
|
| + virtual double duration() const OVERRIDE;
|
|
|
| -protected:
|
| - TimingFunction();
|
| + protected:
|
| + TimingFunction();
|
| };
|
|
|
| class CC_EXPORT CubicBezierTimingFunction : public TimingFunction {
|
| -public:
|
| - static scoped_ptr<CubicBezierTimingFunction> create(double x1, double y1, double x2, double y2);
|
| - virtual ~CubicBezierTimingFunction();
|
| -
|
| - // Partial implementation of FloatAnimationCurve.
|
| - virtual float getValue(double time) const OVERRIDE;
|
| - virtual scoped_ptr<AnimationCurve> clone() const OVERRIDE;
|
| -
|
| -protected:
|
| - CubicBezierTimingFunction(double x1, double y1, double x2, double y2);
|
| -
|
| - SkScalar m_x1;
|
| - SkScalar m_y1;
|
| - SkScalar m_x2;
|
| - SkScalar m_y2;
|
| + public:
|
| + static scoped_ptr<CubicBezierTimingFunction> create(double x1, double y1,
|
| + double x2, double y2);
|
| + virtual ~CubicBezierTimingFunction();
|
| +
|
| + // Partial implementation of FloatAnimationCurve.
|
| + virtual float getValue(double time) const OVERRIDE;
|
| + virtual scoped_ptr<AnimationCurve> clone() const OVERRIDE;
|
| +
|
| + protected:
|
| + CubicBezierTimingFunction(double x1, double y1, double x2, double y2);
|
| +
|
| + SkScalar x1_;
|
| + SkScalar y1_;
|
| + SkScalar x2_;
|
| + SkScalar y2_;
|
| };
|
|
|
| class CC_EXPORT EaseTimingFunction {
|
| -public:
|
| - static scoped_ptr<TimingFunction> create();
|
| + public:
|
| + static scoped_ptr<TimingFunction> create();
|
| };
|
|
|
| class CC_EXPORT EaseInTimingFunction {
|
| -public:
|
| - static scoped_ptr<TimingFunction> create();
|
| + public:
|
| + static scoped_ptr<TimingFunction> create();
|
| };
|
|
|
| class CC_EXPORT EaseOutTimingFunction {
|
| -public:
|
| - static scoped_ptr<TimingFunction> create();
|
| + public:
|
| + static scoped_ptr<TimingFunction> create();
|
| };
|
|
|
| class CC_EXPORT EaseInOutTimingFunction {
|
| -public:
|
| - static scoped_ptr<TimingFunction> create();
|
| + public:
|
| + static scoped_ptr<TimingFunction> create();
|
| };
|
|
|
| -} // namespace cc
|
| +} // namespace cc
|
|
|
| #endif // CC_TIMING_FUNCTION_H_
|
|
|