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

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 "CCRenderSurface.h"
 
 #include "CCAppendQuadsData.h"
 #include "CCLayerImpl.h"
 #include "CCRenderPassSink.h"
 #include "cc/scoped_ptr_vector.h"
 #include "cc/shared_quad_state.h"
 #include "cc/single_thread_proxy.h"
+#include "cc/test/geometry_test_utils.h"
 #include "cc/test/mock_quad_culler.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>
 
 using namespace cc;
 using WebKit::WebTransformationMatrix;
 
 namespace {
 
@@ skipping 80 matching lines @@
     CCAppendQuadsData appendQuadsData;
 
     bool forReplica = false;
     renderSurface->appendQuads(mockQuadCuller, appendQuadsData, forReplica, CCRenderPass::Id(2, 0));
 
     ASSERT_EQ(1u, sharedStateList.size());
     CCSharedQuadState* sharedQuadState = sharedStateList[0];
 
     EXPECT_EQ(30, sharedQuadState->quadTransform.m41());
     EXPECT_EQ(40, sharedQuadState->quadTransform.m42());
-    EXPECT_EQ(contentRect, IntRect(sharedQuadState->visibleContentRect));
+    EXPECT_RECT_EQ(contentRect, IntRect(sharedQuadState->visibleContentRect));
     EXPECT_EQ(1, sharedQuadState->opacity);
     EXPECT_FALSE(sharedQuadState->opaque);
 }
 
 class TestCCRenderPassSink : public CCRenderPassSink {
 public:
     virtual void appendRenderPass(scoped_ptr<CCRenderPass> renderPass) OVERRIDE { m_renderPasses.append(renderPass.Pass()); }
 
     const ScopedPtrVector<CCRenderPass>& renderPasses() const { return m_renderPasses; }
 
@@ skipping 24 matching lines @@
     renderSurface->setContentRect(contentRect);
 
     TestCCRenderPassSink passSink;
 
     renderSurface->appendRenderPasses(passSink);
 
     ASSERT_EQ(1u, passSink.renderPasses().size());
     CCRenderPass* pass = passSink.renderPasses()[0];
 
     EXPECT_EQ(CCRenderPass::Id(2, 0), pass->id());
-    EXPECT_EQ(contentRect, pass->outputRect());
+    EXPECT_RECT_EQ(contentRect, pass->outputRect());
     EXPECT_EQ(origin, pass->transformToRootTarget());
 }
 
 } // namespace