Index: cc/CCTimingFunction.h |
diff --git a/cc/CCTimingFunction.h b/cc/CCTimingFunction.h |
index 993ab872b5bb2a4cc8b139ad95a5ab712fb4d41a..82dd931e4183f5353c8eaf1f7d8d6f169428b621 100644 |
--- a/cc/CCTimingFunction.h |
+++ b/cc/CCTimingFunction.h |
@@ -2,61 +2,5 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CCTimingFunction_h |
-#define CCTimingFunction_h |
- |
-#include "CCAnimationCurve.h" |
-#include "UnitBezier.h" |
- |
-namespace cc { |
- |
-// See http://www.w3.org/TR/css3-transitions/. |
-class CCTimingFunction : public CCFloatAnimationCurve { |
-public: |
- virtual ~CCTimingFunction(); |
- |
- // Partial implementation of CCFloatAnimationCurve. |
- virtual double duration() const OVERRIDE; |
- |
-protected: |
- CCTimingFunction(); |
-}; |
- |
-class CCCubicBezierTimingFunction : public CCTimingFunction { |
-public: |
- static scoped_ptr<CCCubicBezierTimingFunction> create(double x1, double y1, double x2, double y2); |
- virtual ~CCCubicBezierTimingFunction(); |
- |
- // Partial implementation of CCFloatAnimationCurve. |
- virtual float getValue(double time) const OVERRIDE; |
- virtual scoped_ptr<CCAnimationCurve> clone() const OVERRIDE; |
- |
-protected: |
- CCCubicBezierTimingFunction(double x1, double y1, double x2, double y2); |
- |
- UnitBezier m_curve; |
-}; |
- |
-class CCEaseTimingFunction { |
-public: |
- static scoped_ptr<CCTimingFunction> create(); |
-}; |
- |
-class CCEaseInTimingFunction { |
-public: |
- static scoped_ptr<CCTimingFunction> create(); |
-}; |
- |
-class CCEaseOutTimingFunction { |
-public: |
- static scoped_ptr<CCTimingFunction> create(); |
-}; |
- |
-class CCEaseInOutTimingFunction { |
-public: |
- static scoped_ptr<CCTimingFunction> create(); |
-}; |
- |
-} // namespace cc |
- |
-#endif // CCTimingFunction_h |
+// Temporary forwarding header |
+#include "cc/timing_function.h" |