Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1924)

Unified Diff: cc/page_scale_animation.h

Issue 11275113: Remove most remaining references to IntRect and FloatRect. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compositor bindings Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/overdraw_metrics.cc ('k') | cc/page_scale_animation.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « cc/overdraw_metrics.cc ('k') | cc/page_scale_animation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698