Remove most remaining references to IntRect and FloatRect.

cc/page_scale_animation.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "cc/page_scale_animation.h"
 
-#include "FloatRect.h"
+#include "FloatPoint.h"
 #include "FloatSize.h"
+#include "IntPoint.h"
+#include "IntSize.h"
+#include "ui/gfx/rect_f.h"
 
 #include <math.h>
 
 namespace cc {
 
-scoped_ptr<PageScaleAnimation> PageScaleAnimation::create(const IntSize& scrollStart, float pageScaleStart, const IntSize& windowSize, const IntSize& contentSize, double startTime)
+scoped_ptr<PageScaleAnimation> PageScaleAnimation::create(const IntSize& scrollStart, float pageScaleStart, const gfx::Size& windowSize, const gfx::Size& contentSize, double startTime)
 {
     return make_scoped_ptr(new PageScaleAnimation(scrollStart, pageScaleStart, windowSize, contentSize, startTime));
 }
 
-PageScaleAnimation::PageScaleAnimation(const IntSize& scrollStart, float pageScaleStart, const IntSize& windowSize, const IntSize& contentSize, double startTime)
+PageScaleAnimation::PageScaleAnimation(const IntSize& scrollStart, float pageScaleStart, const gfx::Size& windowSize, const gfx::Size& contentSize, double startTime)
     : m_scrollStart(scrollStart)
     , m_pageScaleStart(pageScaleStart)
     , m_windowSize(windowSize)
     , m_contentSize(contentSize)
     , m_anchorMode(false)
     , m_scrollEnd(scrollStart)
     , m_pageScaleEnd(pageScaleStart)
     , m_startTime(startTime)
     , m_duration(0)
 {
 }
 
+PageScaleAnimation::~PageScaleAnimation()
+{
+}
+
 void PageScaleAnimation::zoomTo(const IntSize& finalScroll, float finalPageScale, double duration)
 {
     if (m_pageScaleStart != finalPageScale) {
         // For uniform-looking zooming, infer the anchor (point that remains in
         // place throughout the zoom) from the start and end rects.
-        FloatRect startRect(IntPoint(m_scrollStart), m_windowSize);
-        FloatRect endRect(IntPoint(finalScroll), m_windowSize);
-        endRect.scale(m_pageScaleStart / finalPageScale);
+        gfx::RectF startRect(cc::FloatPoint(cc::IntPoint(m_scrollStart)), m_windowSize);
+        gfx::RectF endRect(cc::FloatPoint(cc::IntPoint(finalScroll)), m_windowSize);
+        endRect.Scale(m_pageScaleStart / finalPageScale);
 
         // The anchor is the point which is at the same ratio of the sides of
         // both startRect and endRect. For example, a zoom-in double-tap to a
         // perfectly centered rect will have anchor ratios (0.5, 0.5), while one
         // to a rect touching the bottom-right of the screen will have anchor
         // ratios (1.0, 1.0). In other words, it obeys the equations:
         // anchorX = start_width * ratioX + start_x
         // anchorX = end_width * ratioX + end_x
         // anchorY = start_height * ratioY + start_y
         // anchorY = end_height * ratioY + end_y
@@ skipping 14 matching lines @@
     }
 }
 
 void PageScaleAnimation::zoomWithAnchor(const IntSize& anchor, float finalPageScale, double duration)
 {
     m_scrollEnd = m_scrollStart + anchor;
     m_scrollEnd.scale(finalPageScale / m_pageScaleStart);
     m_scrollEnd -= anchor;
 
     m_scrollEnd.clampNegativeToZero();
-    FloatSize scaledContentSize(m_contentSize);
-    scaledContentSize.scale(finalPageScale / m_pageScaleStart);
-    IntSize maxScrollPosition = roundedIntSize(scaledContentSize - m_windowSize);
+    gfx::SizeF scaledContentSize = m_contentSize.Scale(finalPageScale / m_pageScaleStart);
+    IntSize maxScrollPosition = roundedIntSize(cc::FloatSize(scaledContentSize) - cc::IntSize(m_windowSize));
     m_scrollEnd = m_scrollEnd.shrunkTo(maxScrollPosition);
 
     m_anchor = anchor;
     m_pageScaleEnd = finalPageScale;
     m_duration = duration;
     m_anchorMode = true;
 }
 
 IntSize PageScaleAnimation::scrollOffsetAtTime(double time) const
 {
@@ skipping 60 matching lines @@
     // example, if we zoom from 0.5 to 4.0 in 3 seconds, then we should
     // be zooming by 2x every second.
     float diff = m_pageScaleEnd / m_pageScaleStart;
     float logDiff = log(diff);
     logDiff *= ratio;
     diff = exp(logDiff);
     return m_pageScaleStart * diff;
 }
 
 }  // namespace cc