Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(294)

Unified Diff: src/gpu/batches/GrAAFillRectBatch.cpp

Issue 1292543002: Minor fix to not save the modeling space rect (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/batches/GrAAFillRectBatch.cpp
diff --git a/src/gpu/batches/GrAAFillRectBatch.cpp b/src/gpu/batches/GrAAFillRectBatch.cpp
index 4fdf8f549c7ee8902c5d048c448828413fdcc991..4cea65ac56451dd309d068a3ebb01b6cad305989 100644
--- a/src/gpu/batches/GrAAFillRectBatch.cpp
+++ b/src/gpu/batches/GrAAFillRectBatch.cpp
@@ -220,9 +220,8 @@ private:
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 @@ class AAFillRectBatchNoLocalMatrixImp {
public:
struct Geometry {
SkMatrix fViewMatrix;
- SkRect fRect;
SkRect fDevRect;
GrColor fColor;
};
@@ -361,7 +359,6 @@ public:
struct Geometry {
SkMatrix fViewMatrix;
SkMatrix fLocalMatrix;
- SkRect fRect;
SkRect fDevRect;
GrColor fColor;
};
@@ -410,7 +407,6 @@ GrBatch* Create(GrColor color,
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 @@ GrBatch* Create(GrColor color,
geo.fColor = color;
geo.fViewMatrix = viewMatrix;
geo.fLocalMatrix = localMatrix;
- geo.fRect = rect;
geo.fDevRect = devRect;
batch->init();
return batch;
@@ -445,7 +440,6 @@ BATCH_TEST_DEFINE(AAFillRectBatch) {
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 @@ BATCH_TEST_DEFINE(AAFillRectBatchLocalMatrix) {
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;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698