| Index: cc/page_scale_animation.h
|
| diff --git a/cc/page_scale_animation.h b/cc/page_scale_animation.h
|
| index a3634f37ab05df0b8e1ec06a61c1509b39c49362..1a4193bdd08209948e0c061b48e355e54ba06b8e 100644
|
| --- a/cc/page_scale_animation.h
|
| +++ b/cc/page_scale_animation.h
|
| @@ -14,12 +14,12 @@ namespace cc {
|
| // double-tap zoom. Initialize it with starting and ending scroll/page scale
|
| // positions and an animation length time, then call ...AtTime() at every frame
|
| // to obtain the current interpolated position.
|
| -class CCPageScaleAnimation {
|
| +class PageScaleAnimation {
|
| public:
|
| // Construct with the starting page scale and scroll offset (which is in
|
| // pageScaleStart space). The window size is the user-viewable area
|
| // in pixels.
|
| - static scoped_ptr<CCPageScaleAnimation> create(const IntSize& scrollStart, float pageScaleStart, const IntSize& windowSize, const IntSize& contentSize, double startTime);
|
| + static scoped_ptr<PageScaleAnimation> create(const IntSize& scrollStart, float pageScaleStart, const IntSize& windowSize, const IntSize& contentSize, double startTime);
|
|
|
| // The following methods initialize the animation. Call one of them
|
| // immediately after construction to set the final scroll and page scale.
|
| @@ -48,7 +48,7 @@ public:
|
| float finalPageScale() const { return m_pageScaleEnd; }
|
|
|
| protected:
|
| - CCPageScaleAnimation(const IntSize& scrollStart, float pageScaleStart, const IntSize& windowSize, const IntSize& contentSize, double startTime);
|
| + PageScaleAnimation(const IntSize& scrollStart, float pageScaleStart, const IntSize& windowSize, const IntSize& contentSize, double startTime);
|
|
|
| private:
|
| float progressRatioForTime(double time) const;
|
|
|