Index: src/gpu/GrAARectRenderer.cpp |
=================================================================== |
--- src/gpu/GrAARectRenderer.cpp (revision 9127) |
+++ src/gpu/GrAARectRenderer.cpp (working copy) |
@@ -364,6 +364,7 @@ |
GrDrawTarget* target, |
const GrRect& rect, |
const SkMatrix& combinedMatrix, |
+ const GrRect& devRect, |
bool useVertexCoverage) { |
GrDrawState* drawState = target->drawState(); |
@@ -389,8 +390,10 @@ |
GrPoint* fan1Pos = reinterpret_cast<GrPoint*>(verts + 4 * vsize); |
if (combinedMatrix.rectStaysRect()) { |
+#if 0 |
bsalomon
2013/05/14 19:36:27
Maybe a comment here (and below) about why this wa
robertphillips
2013/05/14 19:48:05
Done.
|
SkRect devRect; |
combinedMatrix.mapRect(&devRect, rect); |
+#endif |
set_inset_fan(fan0Pos, vsize, devRect, -SK_ScalarHalf, -SK_ScalarHalf); |
set_inset_fan(fan1Pos, vsize, devRect, SK_ScalarHalf, SK_ScalarHalf); |
@@ -628,6 +631,7 @@ |
GrDrawTarget* target, |
const GrRect& rect, |
const SkMatrix& combinedMatrix, |
+ const GrRect& devRect, |
const GrVec& devStrokeSize, |
bool useVertexCoverage) { |
GrDrawState* drawState = target->drawState(); |
@@ -637,8 +641,10 @@ |
const SkScalar rx = SkScalarMul(dx, SK_ScalarHalf); |
const SkScalar ry = SkScalarMul(dy, SK_ScalarHalf); |
+#if 0 |
SkRect devRect; |
combinedMatrix.mapRect(&devRect, rect); |
+#endif |
SkScalar spare; |
{ |
@@ -648,8 +654,9 @@ |
} |
if (spare <= 0) { |
- devRect.inset(-rx, -ry); |
- this->fillAARect(gpu, target, devRect, SkMatrix::I(), useVertexCoverage); |
+ GrRect r(devRect); |
+ r.outset(rx, ry); |
+ this->fillAARect(gpu, target, r, SkMatrix::I(), r, useVertexCoverage); |
return; |
} |