| Index: cc/scrollbar_animation_controller_linear_fade.h
|
| diff --git a/cc/scrollbar_animation_controller_linear_fade.h b/cc/scrollbar_animation_controller_linear_fade.h
|
| index 8b635a11e7a66f147597203067684acdca5f4fd1..6d39459f06e4bb51b16a8bb45425d098f120c3bd 100644
|
| --- a/cc/scrollbar_animation_controller_linear_fade.h
|
| +++ b/cc/scrollbar_animation_controller_linear_fade.h
|
| @@ -9,20 +9,20 @@
|
|
|
| namespace cc {
|
|
|
| -class CCScrollbarAnimationControllerLinearFade : public CCScrollbarAnimationController {
|
| +class ScrollbarAnimationControllerLinearFade : public ScrollbarAnimationController {
|
| public:
|
| - static scoped_ptr<CCScrollbarAnimationControllerLinearFade> create(CCLayerImpl* scrollLayer, double fadeoutDelay, double fadeoutLength);
|
| + static scoped_ptr<ScrollbarAnimationControllerLinearFade> create(LayerImpl* scrollLayer, double fadeoutDelay, double fadeoutLength);
|
|
|
| - virtual ~CCScrollbarAnimationControllerLinearFade();
|
| + virtual ~ScrollbarAnimationControllerLinearFade();
|
|
|
| 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;
|
| + virtual void updateScrollOffsetAtTime(LayerImpl* scrollLayer, double monotonicTime) OVERRIDE;
|
|
|
| protected:
|
| - CCScrollbarAnimationControllerLinearFade(CCLayerImpl* scrollLayer, double fadeoutDelay, double fadeoutLength);
|
| + ScrollbarAnimationControllerLinearFade(LayerImpl* scrollLayer, double fadeoutDelay, double fadeoutLength);
|
|
|
| private:
|
| float opacityAtTime(double monotonicTime);
|
|
|