SkRect to gfx::Rect type conversions.

cc/software_renderer.cc

Index: cc/software_renderer.cc
diff --git a/cc/software_renderer.cc b/cc/software_renderer.cc
index 3d0b60e014c42834eb3380b031ab791be2505622..b9d3b8f87e36605e13fe60d7765851987839b96e 100644
--- a/cc/software_renderer.cc
+++ b/cc/software_renderer.cc
@@ -17,6 +17,7 @@
 #include "third_party/skia/include/core/SkShader.h"
 #include "third_party/skia/include/effects/SkLayerRasterizer.h"
 #include "ui/gfx/rect_conversions.h"
+#include "ui/gfx/skia_util.h"
 #include <public/WebCompositorSoftwareOutputDevice.h>
 #include <public/WebImage.h>
 #include <public/WebSize.h>
@@ -30,16 +31,6 @@ namespace cc {
 
 namespace {
 
-SkRect toSkRect(const gfx::RectF& rect)
-{
-    return SkRect::MakeXYWH(rect.x(), rect.y(), rect.width(), rect.height());
-}
-
-SkIRect toSkIRect(const gfx::Rect& rect)
-{
-    return SkIRect::MakeXYWH(rect.x(), rect.y(), rect.width(), rect.height());
-}
-
 void toSkMatrix(SkMatrix* flattened, const WebTransformationMatrix& m)
 {
     // Convert from 4x4 to 3x3 by dropping the third row and column.
@@ -140,13 +131,13 @@ bool SoftwareRenderer::bindFramebufferToTexture(DrawingFrame& frame, const Scope
 
 void SoftwareRenderer::enableScissorTestRect(const gfx::Rect& scissorRect)
 {
-    m_skCurrentCanvas->clipRect(toSkRect(scissorRect), SkRegion::kReplace_Op);
+    m_skCurrentCanvas->clipRect(gfx::RectFToSkRect(scissorRect), SkRegion::kReplace_Op);
 }
 
 void SoftwareRenderer::disableScissorTest()
 {
     gfx::Rect canvasRect(gfx::Point(), viewportSize());
-    m_skCurrentCanvas->clipRect(toSkRect(canvasRect), SkRegion::kReplace_Op);
+    m_skCurrentCanvas->clipRect(gfx::RectFToSkRect(canvasRect), SkRegion::kReplace_Op);
 }
 
 void SoftwareRenderer::clearFramebuffer(DrawingFrame& frame)
@@ -227,7 +218,7 @@ void SoftwareRenderer::drawDebugBorderQuad(const DrawingFrame& frame, const Debu
 {
     // We need to apply the matrix manually to have pixel-sized stroke width.
     SkPoint vertices[4];
-    toSkRect(quadVertexRect()).toQuad(vertices);
+    gfx::RectFToSkRect(quadVertexRect()).toQuad(vertices);

[jamesr, 2012/11/01 01:15:46]

this line doesn't appear to be doing anything useful with or without this patch

[aelias_OOO_until_Jul13, 2012/11/01 05:00:19]

This line populates "vertices" with the four corners of quadVertexRect.

     SkPoint transformedVertices[4];
     m_skCurrentCanvas->getTotalMatrix().mapPoints(transformedVertices, vertices, 4);
     m_skCurrentCanvas->resetMatrix();
@@ -243,7 +234,7 @@ void SoftwareRenderer::drawSolidColorQuad(const DrawingFrame& frame, const Solid
 {
     m_skCurrentPaint.setColor(quad->color());
     m_skCurrentPaint.setAlpha(quad->opacity() * SkColorGetA(quad->color()));
-    m_skCurrentCanvas->drawRect(toSkRect(quadVertexRect()), m_skCurrentPaint);
+    m_skCurrentCanvas->drawRect(gfx::RectFToSkRect(quadVertexRect()), m_skCurrentPaint);
 }
 
 void SoftwareRenderer::drawTextureQuad(const DrawingFrame& frame, const TextureDrawQuad* quad)
@@ -257,10 +248,10 @@ void SoftwareRenderer::drawTextureQuad(const DrawingFrame& frame, const TextureD
     ResourceProvider::ScopedReadLockSoftware lock(m_resourceProvider, quad->resourceId());
     const SkBitmap* bitmap = lock.skBitmap();
     gfx::RectF uvRect = gfx::ScaleRect(quad->uvRect(), bitmap->width(), bitmap->height());
-    SkIRect skUvRect = toSkIRect(gfx::ToEnclosingRect(uvRect));
+    SkIRect skUvRect = gfx::RectToSkIRect(gfx::ToEnclosingRect(uvRect));
     if (quad->flipped())
         m_skCurrentCanvas->scale(1, -1);
-    m_skCurrentCanvas->drawBitmapRect(*bitmap, &skUvRect, toSkRect(quadVertexRect()), &m_skCurrentPaint);
+    m_skCurrentCanvas->drawBitmapRect(*bitmap, &skUvRect, gfx::RectFToSkRect(quadVertexRect()), &m_skCurrentPaint);
 }
 
 void SoftwareRenderer::drawTileQuad(const DrawingFrame& frame, const TileDrawQuad* quad)
@@ -268,8 +259,8 @@ void SoftwareRenderer::drawTileQuad(const DrawingFrame& frame, const TileDrawQua
     DCHECK(isSoftwareResource(quad->resourceId()));
     ResourceProvider::ScopedReadLockSoftware lock(m_resourceProvider, quad->resourceId());
 
-    SkIRect uvRect = toSkIRect(gfx::Rect(quad->textureOffset(), quad->quadRect().size()));
-    m_skCurrentCanvas->drawBitmapRect(*lock.skBitmap(), &uvRect, toSkRect(quadVertexRect()), &m_skCurrentPaint);
+    SkIRect uvRect = gfx::RectToSkIRect(gfx::Rect(quad->textureOffset(), quad->quadRect().size()));
+    m_skCurrentCanvas->drawBitmapRect(*lock.skBitmap(), &uvRect, gfx::RectFToSkRect(quadVertexRect()), &m_skCurrentPaint);
 }
 
 void SoftwareRenderer::drawRenderPassQuad(const DrawingFrame& frame, const RenderPassDrawQuad* quad)
@@ -281,7 +272,7 @@ void SoftwareRenderer::drawRenderPassQuad(const DrawingFrame& frame, const Rende
     DCHECK(isSoftwareResource(contentTexture->id()));
     ResourceProvider::ScopedReadLockSoftware lock(m_resourceProvider, contentTexture->id());
 
-    SkRect destRect = toSkRect(quadVertexRect());
+    SkRect destRect = gfx::RectFToSkRect(quadVertexRect());
 
     const SkBitmap* content = lock.skBitmap();
 
@@ -334,7 +325,7 @@ void SoftwareRenderer::drawUnsupportedQuad(const DrawingFrame& frame, const Draw
 {
     m_skCurrentPaint.setColor(SK_ColorMAGENTA);
     m_skCurrentPaint.setAlpha(quad->opacity() * 255);
-    m_skCurrentCanvas->drawRect(toSkRect(quadVertexRect()), m_skCurrentPaint);
+    m_skCurrentCanvas->drawRect(gfx::RectFToSkRect(quadVertexRect()), m_skCurrentPaint);
 }
 
 bool SoftwareRenderer::swapBuffers()