cc: Use ui/gfx geometry types for the CCRenderPass and CCDrawQuad classes.

cc/delegated_renderer_layer_impl_unittest.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 "CCDelegatedRendererLayerImpl.h"
 
 #include "CCAppendQuadsData.h"
 #include "CCLayerTreeHostImpl.h"
@@ skipping 70 matching lines @@
     scoped_ptr<CCSolidColorDrawQuad> quad = CCSolidColorDrawQuad::create(sharedState, rect, color);
     CCSolidColorDrawQuad* quadPtr = quad.get();
     quadSink.append(quad.PassAs<CCDrawQuad>(), data);
     return quadPtr;
 }
 
 static void addRenderPassQuad(CCTestRenderPass* toPass, CCTestRenderPass* contributingPass)
 {
     MockCCQuadCuller quadSink(toPass->quadList(), toPass->sharedQuadStateList());
     CCAppendQuadsData data(toPass->id());
-    IntRect outputRect = contributingPass->outputRect();
+    gfx::Rect outputRect = contributingPass->outputRect();
     CCSharedQuadState* sharedState = quadSink.useSharedQuadState(CCSharedQuadState::create(WebTransformationMatrix(), outputRect, outputRect, 1, false));
     scoped_ptr<CCRenderPassDrawQuad> quad = CCRenderPassDrawQuad::create(sharedState, outputRect, contributingPass->id(), false, 0, outputRect, 0, 0, 0, 0);
     quadSink.append(quad.PassAs<CCDrawQuad>(), data);
 }
 
 class CCDelegatedRendererLayerImplTestSimple : public CCDelegatedRendererLayerImplTest {
 public:
     CCDelegatedRendererLayerImplTestSimple()
         : CCDelegatedRendererLayerImplTest()
     {
@@ skipping 193 matching lines @@
     EXPECT_EQ(0, frame.renderPasses[3]->id().index);
     // And all other RenderPasses should be non-delegated.
     EXPECT_NE(4, frame.renderPasses[0]->id().layerId);
     EXPECT_EQ(0, frame.renderPasses[0]->id().index);
     EXPECT_NE(4, frame.renderPasses[4]->id().layerId);
     EXPECT_EQ(0, frame.renderPasses[4]->id().index);
     EXPECT_NE(4, frame.renderPasses[5]->id().layerId);
     EXPECT_EQ(0, frame.renderPasses[5]->id().index);
 
     // The DelegatedRendererLayer should have added its RenderPasses to the frame in order.
-    EXPECT_RECT_EQ(IntRect(6, 6, 6, 6), frame.renderPasses[1]->outputRect());
-    EXPECT_RECT_EQ(IntRect(7, 7, 7, 7), frame.renderPasses[2]->outputRect());
+    EXPECT_RECT_EQ(gfx::Rect(6, 6, 6, 6), frame.renderPasses[1]->outputRect());
+    EXPECT_RECT_EQ(gfx::Rect(7, 7, 7, 7), frame.renderPasses[2]->outputRect());
 }
 
 TEST_F(CCDelegatedRendererLayerImplTestOwnSurface, AddsQuadsToContributingRenderPasses)
 {
     CCLayerTreeHostImpl::FrameData frame;
     EXPECT_TRUE(m_hostImpl->prepareToDraw(frame));
     m_hostImpl->drawLayers(frame);
     m_hostImpl->didDrawAllLayers(frame);
 
     // Each non-DelegatedRendererLayer added one RenderPass. The DelegatedRendererLayer added two contributing passes and its owned surface added one pass.
@@ skipping 128 matching lines @@
     EXPECT_EQ(sharedState, quadList[3]->sharedQuadState());
 
     // The state should be transformed only once.
     EXPECT_RECT_EQ(IntRect(30, 30, 50, 50), sharedState->clippedRectInTarget);
     WebTransformationMatrix expected;
     expected.translate(30, 30);
     EXPECT_TRANSFORMATION_MATRIX_EQ(expected, sharedState->quadTransform);
 }
 
 } // namespace