commit 272b74879233e779b25bb86857b15deff3e4241b
author joshualitt <joshualitt@chromium.org> Thu Aug 13 07:12:50 2015 -0700
committer Commit bot <commit-bot@chromium.org> Thu Aug 13 07:12:50 2015 -0700
tree 123b86f23a9426bfe5961efab96fa253b197d180
parent 2d563030a83ce544bee999b5abe658cbf002587e

Minor fix to not save the modeling space rect

BUG=skia:

Review URL: https://codereview.chromium.org/1292543002

src/gpu/batches/GrAAFillRectBatch.cpp

diff --git a/src/gpu/batches/GrAAFillRectBatch.cpp b/src/gpu/batches/GrAAFillRectBatch.cpp
index 4fdf8f5..4cea65a 100644
--- a/src/gpu/batches/GrAAFillRectBatch.cpp
+++ b/src/gpu/batches/GrAAFillRectBatch.cpp
@@ -220,9 +220,8 @@
             vec[1].scale(SK_ScalarHalf);
 
             // create the rotated rect
-            fan0Pos->setRectFan(args.fRect.fLeft, args.fRect.fTop,
-                                args.fRect.fRight, args.fRect.fBottom, vertexStride);
-            args.fViewMatrix.mapPointsWithStride(fan0Pos, vertexStride, 4);
+            fan0Pos->setRectFan(args.fDevRect.fLeft, args.fDevRect.fTop,
+                                args.fDevRect.fRight, args.fDevRect.fBottom, vertexStride);
 
             // Now create the inset points and then outset the original
             // rotated points
@@ -329,7 +328,6 @@
 public:
     struct Geometry {
         SkMatrix fViewMatrix;
-        SkRect fRect;
         SkRect fDevRect;
         GrColor fColor;
     };
@@ -361,7 +359,6 @@
     struct Geometry {
         SkMatrix fViewMatrix;
         SkMatrix fLocalMatrix;
-        SkRect fRect;
         SkRect fDevRect;
         GrColor fColor;
     };
@@ -410,7 +407,6 @@
     AAFillRectBatchNoLocalMatrix::Geometry& geo = *batch->geometry();
     geo.fColor = color;
     geo.fViewMatrix = viewMatrix;
-    geo.fRect = rect;
     geo.fDevRect = devRect;
     batch->init();
     return batch;
@@ -426,7 +422,6 @@
     geo.fColor = color;
     geo.fViewMatrix = viewMatrix;
     geo.fLocalMatrix = localMatrix;
-    geo.fRect = rect;
     geo.fDevRect = devRect;
     batch->init();
     return batch;
@@ -445,7 +440,6 @@
     AAFillRectBatchNoLocalMatrix::Geometry& geo = *batch->geometry();
     geo.fColor = GrRandomColor(random);
     geo.fViewMatrix = GrTest::TestMatrix(random);
-    geo.fRect = GrTest::TestRect(random);
     geo.fDevRect = GrTest::TestRect(random);
     batch->init();
     return batch;
@@ -457,7 +451,6 @@
     geo.fColor = GrRandomColor(random);
     geo.fViewMatrix = GrTest::TestMatrix(random);
     geo.fLocalMatrix = GrTest::TestMatrix(random);
-    geo.fRect = GrTest::TestRect(random);
     geo.fDevRect = GrTest::TestRect(random);
     batch->init();
     return batch;