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

cc/CCRendererSoftware.cpp

Index: cc/CCRendererSoftware.cpp
diff --git a/cc/CCRendererSoftware.cpp b/cc/CCRendererSoftware.cpp
index c6994fa86458e7fab55b5cc0cc018e4a664455b5..ab43ed79f8076114f8991a8e943d15feae5ca5ac 100644
--- a/cc/CCRendererSoftware.cpp
+++ b/cc/CCRendererSoftware.cpp
@@ -28,12 +28,12 @@ namespace cc {
 
 namespace {
 
-SkRect toSkRect(const FloatRect& rect)
+SkRect toSkRect(const ccmath::FloatRect& rect)
 {
     return SkRect::MakeXYWH(rect.x(), rect.y(), rect.width(), rect.height());
 }
 
-SkIRect toSkIRect(const IntRect& rect)
+SkIRect toSkIRect(const ccmath::IntRect& rect)
 {
     return SkIRect::MakeXYWH(rect.x(), rect.y(), rect.width(), rect.height());
 }
@@ -118,7 +118,7 @@ void CCRendererSoftware::bindFramebufferToOutputSurface(DrawingFrame& frame)
     m_skCurrentCanvas = &m_skRootCanvas;
 }
 
-bool CCRendererSoftware::bindFramebufferToTexture(DrawingFrame& frame, const CCScopedTexture* texture, const IntRect& framebufferRect)
+bool CCRendererSoftware::bindFramebufferToTexture(DrawingFrame& frame, const CCScopedTexture* texture, const ccmath::IntRect& framebufferRect)
 {
     m_currentFramebufferLock = adoptPtr(new CCResourceProvider::ScopedWriteLockSoftware(m_resourceProvider, texture->id()));
     m_skCurrentCanvas = m_currentFramebufferLock->skCanvas();
@@ -128,14 +128,14 @@ bool CCRendererSoftware::bindFramebufferToTexture(DrawingFrame& frame, const CCS
     return true;
 }
 
-void CCRendererSoftware::enableScissorTestRect(const IntRect& scissorRect)
+void CCRendererSoftware::enableScissorTestRect(const ccmath::IntRect& scissorRect)
 {
     m_skCurrentCanvas->clipRect(toSkRect(scissorRect), SkRegion::kReplace_Op);
 }
 
 void CCRendererSoftware::disableScissorTest()
 {
-    IntRect canvasRect(IntPoint(), viewportSize());
+    ccmath::IntRect canvasRect(ccmath::IntPoint(), viewportSize());
     m_skCurrentCanvas->clipRect(toSkRect(canvasRect), SkRegion::kReplace_Op);
 }
 
@@ -144,7 +144,7 @@ void CCRendererSoftware::clearFramebuffer(DrawingFrame& frame)
     m_skCurrentCanvas->clear(SK_ColorGREEN);
 }
 
-void CCRendererSoftware::setDrawViewportSize(const IntSize& viewportSize)
+void CCRendererSoftware::setDrawViewportSize(const ccmath::IntSize& viewportSize)
 {
 }
 
@@ -229,9 +229,9 @@ void CCRendererSoftware::drawTextureQuad(const DrawingFrame& frame, const CCText
 
     // FIXME: Add support for non-premultiplied alpha.
     CCResourceProvider::ScopedReadLockSoftware quadResourceLock(m_resourceProvider, quad->resourceId());
-    FloatRect uvRect = quad->uvRect();
-    uvRect.scale(quad->quadRect().width(), quad->quadRect().height());
-    SkIRect skUvRect = toSkIRect(enclosingIntRect(uvRect));
+    ccmath::FloatRect uvRect = quad->uvRect();
+    uvRect.Scale(quad->quadRect().width(), quad->quadRect().height());
+    SkIRect skUvRect = toSkIRect(uvRect.EnclosingIntRect());
     if (quad->flipped())
         m_skCurrentCanvas->scale(1, -1);
     m_skCurrentCanvas->drawBitmapRect(*quadResourceLock.skBitmap(), &skUvRect, toSkRect(quadVertexRect()), &m_skCurrentPaint);
@@ -242,7 +242,7 @@ void CCRendererSoftware::drawTileQuad(const DrawingFrame& frame, const CCTileDra
     ASSERT(isSoftwareResource(quad->resourceId()));
     CCResourceProvider::ScopedReadLockSoftware quadResourceLock(m_resourceProvider, quad->resourceId());
 
-    SkIRect uvRect = toSkIRect(IntRect(quad->textureOffset(), quad->quadRect().size()));
+    SkIRect uvRect = toSkIRect(ccmath::IntRect(quad->textureOffset(), quad->quadRect().size()));
     m_skCurrentCanvas->drawBitmapRect(*quadResourceLock.skBitmap(), &uvRect, toSkRect(quadVertexRect()), &m_skCurrentPaint);
 }