commit 20efde71b4fd28691b10c8f1cfe15cb2aafddaea
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon May 09 17:00:02 2011 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon May 09 17:00:02 2011 +0000
tree 6c79559680135a2e8f1f85960035883a8cf7b915
parent 59f9961d007b573aee350218f5c5e18e4a41a2f7

Share code with SkRect

http://codereview.appspot.com/4523046/



git-svn-id: http://skia.googlecode.com/svn/trunk@1277 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/SkGpuDevice.cpp

diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 2a50177..afd5bd3 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -691,7 +691,7 @@
     if (!this->skPaint2GrPaintShader(paint, &act, *draw.fMatrix,  &grPaint)) {
         return;
     }
-    fContext->drawRect(grPaint, Sk2Gr(rect), doStroke ? width : -1);
+    fContext->drawRect(grPaint, rect, doStroke ? width : -1);
 }
 
 #include "SkMaskFilter.h"
@@ -967,7 +967,8 @@
 
     grPaint->setTexture(texture);
 
-    GrRect dstRect(0, 0, GrIntToScalar(srcRect.width()), GrIntToScalar(srcRect.height()));
+    GrRect dstRect = SkRect::MakeWH(GrIntToScalar(srcRect.width()),
+                                    GrIntToScalar(srcRect.height()));
     GrRect paintRect;
     paintRect.setLTRB(GrFixedToScalar((srcRect.fLeft << 16)   / bitmap.width()),
                       GrFixedToScalar((srcRect.fTop << 16)    / bitmap.height()),
@@ -1003,10 +1004,11 @@
     grPaint.setTexture(texture);
 
     fContext->drawRectToRect(grPaint,
-                             GrRect(GrIntToScalar(left), GrIntToScalar(top),
-                                    GrIntToScalar(left + bitmap.width()),
-                                    GrIntToScalar(top + bitmap.height())),
-                             GrRect(0, 0, GR_Scalar1, GR_Scalar1));
+                             GrRect::MakeXYWH(GrIntToScalar(left),
+                                              GrIntToScalar(top),
+                                              GrIntToScalar(bitmap.width()),
+                                              GrIntToScalar(bitmap.height())),
+                             GrRect::MakeWH(GR_Scalar1, GR_Scalar1));
 }
 
 void SkGpuDevice::drawDevice(const SkDraw& draw, SkDevice* dev,
@@ -1030,11 +1032,11 @@
     grPaint.fSampler.setClampNoFilter();
 
     fContext->drawRectToRect(grPaint,
-                             GrRect(GrIntToScalar(x),
-                                    GrIntToScalar(y),
-                                    GrIntToScalar(x + w),
-                                    GrIntToScalar(y + h)),
-                             GrRect(0, 0, GR_Scalar1, GR_Scalar1));
+                             GrRect::MakeXYWH(GrIntToScalar(x),
+                                              GrIntToScalar(y),
+                                              GrIntToScalar(w),
+                                              GrIntToScalar(h)),
+                             GrRect::MakeWH(GR_Scalar1, GR_Scalar1));
 }
 
 ///////////////////////////////////////////////////////////////////////////////