diff options
| author | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-05-09 17:00:02 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-05-09 17:00:02 +0000 |
| commit | 2164ea574260812b24c6644ac9277db2965dc512 (patch) | |
| tree | 8a2bbaedf888770215fff754c84835bd2e0f321a | |
| parent | a6cf7e9cd05d84108d7668e9e1bde927bee7a9f5 (diff) | |
| download | src-2164ea574260812b24c6644ac9277db2965dc512.tar.gz | |
Share code with SkRect
http://codereview.appspot.com/4523046/
git-svn-id: http://skia.googlecode.com/svn/trunk/src@1277 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | gpu/SkGpuDevice.cpp | 24 | ||||
| -rw-r--r-- | gpu/SkGr.cpp | 2 |
2 files changed, 14 insertions, 12 deletions
diff --git a/gpu/SkGpuDevice.cpp b/gpu/SkGpuDevice.cpp index 2a501776..afd5bd37 100644 --- a/gpu/SkGpuDevice.cpp +++ b/gpu/SkGpuDevice.cpp @@ -691,7 +691,7 @@ void SkGpuDevice::drawRect(const SkDraw& draw, const SkRect& rect, 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 @@ void SkGpuDevice::internalDrawBitmap(const SkDraw& draw, 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 @@ void SkGpuDevice::drawSprite(const SkDraw& draw, const SkBitmap& bitmap, 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 @@ void SkGpuDevice::drawDevice(const SkDraw& draw, SkDevice* dev, 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)); } /////////////////////////////////////////////////////////////////////////////// diff --git a/gpu/SkGr.cpp b/gpu/SkGr.cpp index 23918f9e..f65cf1ee 100644 --- a/gpu/SkGr.cpp +++ b/gpu/SkGr.cpp @@ -144,7 +144,7 @@ GrConvexHint SkGrPathIter::convexHint() const { } bool SkGrPathIter::getConservativeBounds(GrRect* rect) const { - *rect = Sk2Gr(fPath->getBounds()); + *rect = fPath->getBounds(); return true; } |