Remove most remaining references to IntRect and FloatRect.

cc/layer_tree_host_impl.cc

 // Copyright 2011 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/layer_tree_host_impl.h"
 
 #include "base/basictypes.h"
 #include "base/debug/trace_event.h"
@@ skipping 87 matching lines @@
 {
     gfx::SizeF scaledViewportSize = m_layoutViewportSize;
     scaledViewportSize = scaledViewportSize.Scale(1 / totalPageScaleFactor());
 
     gfx::RectF bounds(gfx::PointF(), scaledViewportSize);
     bounds.set_origin(m_pinchViewportScrollDelta);
 
     return bounds;
 }
 
-FloatSize PinchZoomViewport::applyScroll(FloatSize& delta)
+FloatSize PinchZoomViewport::applyScroll(const gfx::Vector2dF& delta)
 {
-    FloatSize overflow;
-    FloatRect pinchedBounds = cc::FloatRect(bounds());
+    gfx::Vector2dF overflow;
+    gfx::RectF pinchedBounds = bounds();
 
-    pinchedBounds.move(delta);
+    pinchedBounds.Offset(delta);
     if (pinchedBounds.x() < 0) {
-        overflow.setWidth(pinchedBounds.x());
-        pinchedBounds.setX(0);
+        overflow.set_x(pinchedBounds.x());
+        pinchedBounds.set_x(0);
     }
 
     if (pinchedBounds.y() < 0) {
-        overflow.setHeight(pinchedBounds.y());
-        pinchedBounds.setY(0);
+        overflow.set_y(pinchedBounds.y());
+        pinchedBounds.set_y(0);
     }
 
-    if (pinchedBounds.maxX() > m_layoutViewportSize.width()) {
-        overflow.setWidth(
-            pinchedBounds.maxX() - m_layoutViewportSize.width());
-        pinchedBounds.move(
-            m_layoutViewportSize.width() - pinchedBounds.maxX(), 0);
+    if (pinchedBounds.right() > m_layoutViewportSize.width()) {
+        overflow.set_x(pinchedBounds.right() - m_layoutViewportSize.width());
+        pinchedBounds.Offset(m_layoutViewportSize.width() - pinchedBounds.right(), 0);
     }
 
-    if (pinchedBounds.maxY() > m_layoutViewportSize.height()) {
-        overflow.setHeight(
-            pinchedBounds.maxY() - m_layoutViewportSize.height());
-        pinchedBounds.move(
-            0, m_layoutViewportSize.height() - pinchedBounds.maxY());
+    if (pinchedBounds.bottom() > m_layoutViewportSize.height()) {
+        overflow.set_y(pinchedBounds.bottom() - m_layoutViewportSize.height());
+        pinchedBounds.Offset(0, m_layoutViewportSize.height() - pinchedBounds.bottom());
     }
-    m_pinchViewportScrollDelta = pinchedBounds.location();
+    m_pinchViewportScrollDelta = cc::FloatPoint(pinchedBounds.origin());
 
-    return overflow;
+    return cc::FloatSize(overflow);
 }
 
 WebTransformationMatrix PinchZoomViewport::implTransform() const
 {
     WebTransformationMatrix transform;
     transform.scale(m_pageScaleDelta);
 
     // If the pinch state is applied in the impl, then push it to the
     // impl transform, otherwise the scale is handled by WebCore.
     if (Settings::pageScalePinchZoomEnabled()) {
@@ skipping 545 matching lines @@
     // Because the contents of the HUD depend on everything else in the frame, the contents
     // of its texture are updated as the last thing before the frame is drawn.
     if (m_hudLayerImpl)
         m_hudLayerImpl->updateHudTexture(m_resourceProvider.get());
 
     m_renderer->drawFrame(frame.renderPasses, frame.renderPassesById);
 
     // Once a RenderPass has been drawn, its damage should be cleared in
     // case the RenderPass will be reused next frame.
     for (unsigned int i = 0; i < frame.renderPasses.size(); i++)
-        frame.renderPasses[i]->setDamageRect(FloatRect());
+        frame.renderPasses[i]->setDamageRect(gfx::RectF());
 
     // The next frame should start by assuming nothing has changed, and changes are noted as they occur.
     for (unsigned int i = 0; i < frame.renderSurfaceLayerList->size(); i++)
         (*frame.renderSurfaceLayerList)[i]->renderSurface()->damageTracker()->didDrawDamagedArea();
     m_rootLayerImpl->resetAllChangeTrackingForSubtree();
 }
 
 void LayerTreeHostImpl::didDrawAllLayers(const FrameData& frame)
 {
     for (size_t i = 0; i < frame.willDrawLayers.size(); ++i)
@@ skipping 775 matching lines @@
     ScrollbarAnimationController* scrollbarController = layer->scrollbarAnimationController();
     double monotonicTime = (time - base::TimeTicks()).InSecondsF();
     if (scrollbarController && scrollbarController->animate(monotonicTime))
         m_client->setNeedsRedrawOnImplThread();
 
     for (size_t i = 0; i < layer->children().size(); ++i)
         animateScrollbarsRecursive(layer->children()[i], time);
 }
 
 }  // namespace cc