| Index: cc/page_scale_animation.h
|
| diff --git a/cc/page_scale_animation.h b/cc/page_scale_animation.h
|
| index 1a4193bdd08209948e0c061b48e355e54ba06b8e..2ce512fe65a3ca8dc3e576533a2ec2fc3c758421 100644
|
| --- a/cc/page_scale_animation.h
|
| +++ b/cc/page_scale_animation.h
|
| @@ -19,7 +19,8 @@ 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<PageScaleAnimation> 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 gfx::Size& windowSize, const gfx::Size& contentSize, double startTime);
|
| + ~PageScaleAnimation();
|
|
|
| // The following methods initialize the animation. Call one of them
|
| // immediately after construction to set the final scroll and page scale.
|
| @@ -48,7 +49,7 @@ public:
|
| float finalPageScale() const { return m_pageScaleEnd; }
|
|
|
| protected:
|
| - PageScaleAnimation(const IntSize& scrollStart, float pageScaleStart, const IntSize& windowSize, const IntSize& contentSize, double startTime);
|
| + PageScaleAnimation(const IntSize& scrollStart, float pageScaleStart, const gfx::Size& windowSize, const gfx::Size& contentSize, double startTime);
|
|
|
| private:
|
| float progressRatioForTime(double time) const;
|
| @@ -57,8 +58,8 @@ private:
|
|
|
| IntSize m_scrollStart;
|
| float m_pageScaleStart;
|
| - IntSize m_windowSize;
|
| - IntSize m_contentSize;
|
| + gfx::Size m_windowSize;
|
| + gfx::Size m_contentSize;
|
|
|
| bool m_anchorMode;
|
| IntSize m_anchor;
|
|
|