Use gfx:: Geometry types for the resource provider and layer updater classes.

cc/content_layer_updater.cc

Index: cc/content_layer_updater.cc
diff --git a/cc/content_layer_updater.cc b/cc/content_layer_updater.cc
index b151bfb34736822ca8d28e134fc3569216e7eb34..8888e0da86da56496d1542a1e7097673c3403939 100644
--- a/cc/content_layer_updater.cc
+++ b/cc/content_layer_updater.cc
@@ -6,7 +6,6 @@
 
 #include "cc/content_layer_updater.h"
 
-#include "FloatRect.h"
 #include "SkiaUtils.h"
 #include "base/debug/trace_event.h"
 #include "base/time.h"
@@ -15,6 +14,8 @@
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkRect.h"
+#include "ui/gfx/rect_conversions.h"
+#include "ui/gfx/rect_f.h"
 
 namespace cc {
 
@@ -27,20 +28,19 @@ ContentLayerUpdater::~ContentLayerUpdater()
 {
 }
 
-void ContentLayerUpdater::paintContents(SkCanvas* canvas, const IntRect& contentRect, float contentsWidthScale, float contentsHeightScale, IntRect& resultingOpaqueRect, RenderingStats& stats)
+void ContentLayerUpdater::paintContents(SkCanvas* canvas, const gfx::Rect& contentRect, float contentsWidthScale, float contentsHeightScale, gfx::Rect& resultingOpaqueRect, RenderingStats& stats)
 {
     TRACE_EVENT0("cc", "ContentLayerUpdater::paintContents");
     canvas->save();
     canvas->translate(FloatToSkScalar(-contentRect.x()), FloatToSkScalar(-contentRect.y()));
 
-    IntRect layerRect = contentRect;
+    gfx::Rect layerRect = contentRect;
 
     if (contentsWidthScale != 1 || contentsHeightScale != 1) {
         canvas->scale(FloatToSkScalar(contentsWidthScale), FloatToSkScalar(contentsHeightScale));
 
-        FloatRect rect = contentRect;
-        rect.scale(1 / contentsWidthScale, 1 / contentsHeightScale);
-        layerRect = enclosingIntRect(rect);
+        gfx::RectF rect = gfx::ScaleRect(contentRect, 1 / contentsWidthScale, 1 / contentsHeightScale);
+        layerRect = gfx::ToEnclosingRect(rect);
     }
 
     SkPaint paint;
@@ -50,15 +50,14 @@ void ContentLayerUpdater::paintContents(SkCanvas* canvas, const IntRect& content
     canvas->drawRect(layerSkRect, paint);
     canvas->clipRect(layerSkRect);
 
-    FloatRect opaqueLayerRect;
+    gfx::RectF opaqueLayerRect;
     base::TimeTicks paintBeginTime = base::TimeTicks::Now();
     m_painter->paint(canvas, layerRect, opaqueLayerRect);
     stats.totalPaintTimeInSeconds += (base::TimeTicks::Now() - paintBeginTime).InSecondsF();
     canvas->restore();
 
-    FloatRect opaqueContentRect = opaqueLayerRect;
-    opaqueContentRect.scale(contentsWidthScale, contentsHeightScale);
-    resultingOpaqueRect = enclosedIntRect(opaqueContentRect);
+    gfx::RectF opaqueContentRect = gfx::ScaleRect(opaqueLayerRect, contentsWidthScale, contentsHeightScale);
+    resultingOpaqueRect = gfx::ToEnclosedRect(opaqueContentRect);
 
     m_contentRect = contentRect;
 }