| Index: cc/animation/timing_function.h
|
| diff --git a/cc/animation/timing_function.h b/cc/animation/timing_function.h
|
| index d1807f6f091c90a2cffd947d2f95c20541c1c195..ebe31fcfbba43c5192f1aa9e397a17e859ff278c 100644
|
| --- a/cc/animation/timing_function.h
|
| +++ b/cc/animation/timing_function.h
|
| @@ -48,10 +48,17 @@ class CC_EXPORT CubicBezierTimingFunction : public TimingFunction {
|
| void Range(float* min, float* max) const override;
|
| std::unique_ptr<TimingFunction> Clone() const override;
|
|
|
| + EaseType ease_type() const { return ease_type_; }
|
| +
|
| protected:
|
| - CubicBezierTimingFunction(double x1, double y1, double x2, double y2);
|
| + CubicBezierTimingFunction(EaseType ease_type,
|
| + double x1,
|
| + double y1,
|
| + double x2,
|
| + double y2);
|
|
|
| gfx::CubicBezier bezier_;
|
| + EaseType ease_type_;
|
|
|
| private:
|
| DISALLOW_ASSIGN(CubicBezierTimingFunction);
|
|
|