Remove most remaining references to IntRect and FloatRect.

cc/render_surface_unittest.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/render_surface_impl.h"
 
 #include "cc/append_quads_data.h"
 #include "cc/layer_impl.h"
@@ skipping 25 matching lines @@
 TEST(RenderSurfaceTest, verifySurfaceChangesAreTrackedProperly)
 {
     //
     // This test checks that surfacePropertyChanged() has the correct behavior.
     //
 
     scoped_ptr<LayerImpl> owningLayer = LayerImpl::create(1);
     owningLayer->createRenderSurface();
     ASSERT_TRUE(owningLayer->renderSurface());
     RenderSurfaceImpl* renderSurface = owningLayer->renderSurface();
-    IntRect testRect = IntRect(IntPoint(3, 4), IntSize(5, 6));
+    gfx::Rect testRect = gfx::Rect(gfx::Point(3, 4), gfx::Size(5, 6));
     owningLayer->resetAllChangeTrackingForSubtree();
 
     // Currently, the contentRect, clipRect, and owningLayer->layerPropertyChanged() are
     // the only sources of change.
     EXECUTE_AND_VERIFY_SURFACE_CHANGED(renderSurface->setClipRect(testRect));
     EXECUTE_AND_VERIFY_SURFACE_CHANGED(renderSurface->setContentRect(testRect));
 
     owningLayer->setOpacity(0.5f);
     EXPECT_TRUE(renderSurface->surfacePropertyChanged());
     owningLayer->resetAllChangeTrackingForSubtree();
@@ skipping 19 matching lines @@
     scoped_ptr<LayerImpl> rootLayer = LayerImpl::create(1);
 
     scoped_ptr<LayerImpl> owningLayer = LayerImpl::create(2);
     owningLayer->createRenderSurface();
     ASSERT_TRUE(owningLayer->renderSurface());
     owningLayer->setRenderTarget(owningLayer.get());
     RenderSurfaceImpl* renderSurface = owningLayer->renderSurface();
 
     rootLayer->addChild(owningLayer.Pass());
 
-    IntRect contentRect = IntRect(IntPoint::zero(), IntSize(50, 50));
-    IntRect clipRect = IntRect(IntPoint(5, 5), IntSize(40, 40));
+    gfx::Rect contentRect = gfx::Rect(gfx::Point(), gfx::Size(50, 50));
+    gfx::Rect clipRect = gfx::Rect(gfx::Point(5, 5), gfx::Size(40, 40));
     WebTransformationMatrix origin;
 
     origin.translate(30, 40);
 
     renderSurface->setDrawTransform(origin);
     renderSurface->setContentRect(contentRect);
     renderSurface->setClipRect(clipRect);
     renderSurface->setDrawOpacity(1);
 
     QuadList quadList;
     SharedQuadStateList sharedStateList;
     MockQuadCuller mockQuadCuller(quadList, sharedStateList);
     AppendQuadsData appendQuadsData;
 
     bool forReplica = false;
     renderSurface->appendQuads(mockQuadCuller, appendQuadsData, forReplica, RenderPass::Id(2, 0));
 
     ASSERT_EQ(1u, sharedStateList.size());
     SharedQuadState* sharedQuadState = sharedStateList[0];
 
     EXPECT_EQ(30, sharedQuadState->quadTransform.m41());
     EXPECT_EQ(40, sharedQuadState->quadTransform.m42());
-    EXPECT_RECT_EQ(contentRect, IntRect(sharedQuadState->visibleContentRect));
+    EXPECT_RECT_EQ(contentRect, gfx::Rect(sharedQuadState->visibleContentRect));
     EXPECT_EQ(1, sharedQuadState->opacity);
     EXPECT_FALSE(sharedQuadState->opaque);
 }
 
 class TestRenderPassSink : public RenderPassSink {
 public:
     virtual void appendRenderPass(scoped_ptr<RenderPass> renderPass) OVERRIDE { m_renderPasses.append(renderPass.Pass()); }
 
     const ScopedPtrVector<RenderPass>& renderPasses() const { return m_renderPasses; }
 
 private:
     ScopedPtrVector<RenderPass> m_renderPasses;
 };
 
 TEST(RenderSurfaceTest, sanityCheckSurfaceCreatesCorrectRenderPass)
 {
     scoped_ptr<LayerImpl> rootLayer = LayerImpl::create(1);
 
     scoped_ptr<LayerImpl> owningLayer = LayerImpl::create(2);
     owningLayer->createRenderSurface();
     ASSERT_TRUE(owningLayer->renderSurface());
     owningLayer->setRenderTarget(owningLayer.get());
     RenderSurfaceImpl* renderSurface = owningLayer->renderSurface();
 
     rootLayer->addChild(owningLayer.Pass());
 
-    IntRect contentRect = IntRect(IntPoint::zero(), IntSize(50, 50));
+    gfx::Rect contentRect = gfx::Rect(gfx::Point(), gfx::Size(50, 50));
     WebTransformationMatrix origin;
     origin.translate(30, 40);
 
     renderSurface->setScreenSpaceTransform(origin);
     renderSurface->setContentRect(contentRect);
 
     TestRenderPassSink passSink;
 
     renderSurface->appendRenderPasses(passSink);
 
     ASSERT_EQ(1u, passSink.renderPasses().size());
     RenderPass* pass = passSink.renderPasses()[0];
 
     EXPECT_EQ(RenderPass::Id(2, 0), pass->id());
     EXPECT_RECT_EQ(contentRect, pass->outputRect());
     EXPECT_EQ(origin, pass->transformToRootTarget());
 }
 
 } // namespace