Index: cc/CCScrollbarAnimationControllerLinearFade.h |
diff --git a/cc/CCScrollbarAnimationControllerLinearFade.h b/cc/CCScrollbarAnimationControllerLinearFade.h |
index 749dca5e3f3493d186f151c2f4008f0ab1d1f253..7ce0e02adaf2e173496247b4c113bde2a63c803b 100644 |
--- a/cc/CCScrollbarAnimationControllerLinearFade.h |
+++ b/cc/CCScrollbarAnimationControllerLinearFade.h |
@@ -2,38 +2,5 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CCScrollbarAnimationControllerLinearFade_h |
-#define CCScrollbarAnimationControllerLinearFade_h |
- |
-#include "CCScrollbarAnimationController.h" |
- |
-namespace cc { |
- |
-class CCScrollbarAnimationControllerLinearFade : public CCScrollbarAnimationController { |
-public: |
- static PassOwnPtr<CCScrollbarAnimationControllerLinearFade> create(CCLayerImpl* scrollLayer, double fadeoutDelay, double fadeoutLength); |
- |
- virtual ~CCScrollbarAnimationControllerLinearFade(); |
- |
- virtual bool animate(double monotonicTime) OVERRIDE; |
- |
- virtual void didPinchGestureUpdateAtTime(double monotonicTime) OVERRIDE; |
- virtual void didPinchGestureEndAtTime(double monotonicTime) OVERRIDE; |
- virtual void updateScrollOffsetAtTime(CCLayerImpl* scrollLayer, double monotonicTime) OVERRIDE; |
- |
-protected: |
- CCScrollbarAnimationControllerLinearFade(CCLayerImpl* scrollLayer, double fadeoutDelay, double fadeoutLength); |
- |
-private: |
- float opacityAtTime(double monotonicTime); |
- |
- double m_lastAwakenTime; |
- bool m_pinchGestureInEffect; |
- |
- double m_fadeoutDelay; |
- double m_fadeoutLength; |
-}; |
- |
-} // namespace cc |
- |
-#endif // CCScrollbarAnimationControllerLinearFade_h |
+// Temporary forwarding header |
+#include "cc/scrollbar_animation_controller_linear_fade.h" |