| Index: src/gpu/batches/GrAAFillRectBatch.cpp
|
| diff --git a/src/gpu/batches/GrAAFillRectBatch.cpp b/src/gpu/batches/GrAAFillRectBatch.cpp
|
| index 5b22422e1098b6ff2ebb31c8780c93f4d3f9822d..62bf2e694af0ef295291e645928e9ef69739fda1 100644
|
| --- a/src/gpu/batches/GrAAFillRectBatch.cpp
|
| +++ b/src/gpu/batches/GrAAFillRectBatch.cpp
|
| @@ -324,8 +324,11 @@ GrDrawBatch* Create(GrColor color,
|
| GrDrawBatch* Create(GrColor color,
|
| const SkMatrix& viewMatrix,
|
| const SkMatrix& localMatrix,
|
| - const SkRect& rect,
|
| - const SkRect& devRect) {
|
| + const SkRect& rect) {
|
| + //map rect
|
| + SkRect devRect;
|
| + viewMatrix.mapRect(&devRect, rect);
|
| +
|
| AAFillRectBatchLocalMatrix* batch = AAFillRectBatchLocalMatrix::Create();
|
| append_to_batch(batch, color, viewMatrix, localMatrix, rect, devRect);
|
| batch->init();
|
| @@ -335,8 +338,11 @@ GrDrawBatch* Create(GrColor color,
|
| void Append(GrBatch* origBatch,
|
| GrColor color,
|
| const SkMatrix& viewMatrix,
|
| - const SkRect& rect,
|
| - const SkRect& devRect) {
|
| + const SkRect& rect) {
|
| + // map rect
|
| + SkRect devRect;
|
| + viewMatrix.mapRect(&devRect, rect);
|
| +
|
| AAFillRectBatchNoLocalMatrix* batch = origBatch->cast<AAFillRectBatchNoLocalMatrix>();
|
| append_to_batch(batch, color, viewMatrix, rect, devRect);
|
| batch->updateBoundsAfterAppend();
|
| @@ -374,8 +380,7 @@ DRAW_BATCH_TEST_DEFINE(AAFillRectBatchLocalMatrix) {
|
| SkMatrix viewMatrix = GrTest::TestMatrixInvertible(random);
|
| SkMatrix localMatrix = GrTest::TestMatrix(random);
|
| SkRect rect = GrTest::TestRect(random);
|
| - SkRect devRect = GrTest::TestRect(random);
|
| - return GrAAFillRectBatch::Create(color, viewMatrix, localMatrix, rect, devRect);
|
| + return GrAAFillRectBatch::Create(color, viewMatrix, localMatrix, rect);
|
| }
|
|
|
| #endif
|
|
|