| Index: src/gpu/batches/GrDrawAtlasBatch.h
|
| diff --git a/src/gpu/batches/GrDrawAtlasBatch.h b/src/gpu/batches/GrDrawAtlasBatch.h
|
| index de128f211db1ccc9e7b245f77c64faaa08e67df0..9a864c01c9c859457015e97d54cae8b8edb7a084 100644
|
| --- a/src/gpu/batches/GrDrawAtlasBatch.h
|
| +++ b/src/gpu/batches/GrDrawAtlasBatch.h
|
| @@ -14,13 +14,11 @@
|
|
|
| class GrDrawAtlasBatch : public GrVertexBatch {
|
| public:
|
| - DEFINE_BATCH_CLASS_ID
|
| -
|
| struct Geometry {
|
| GrColor fColor;
|
| SkTArray<uint8_t, true> fVerts;
|
| };
|
| -
|
| +
|
| static GrDrawBatch* Create(const Geometry& geometry, const SkMatrix& viewMatrix,
|
| int spriteCount, const SkRSXform* xforms, const SkRect* rects,
|
| const SkColor* colors) {
|
| @@ -68,8 +66,6 @@
|
| bool fColorIgnored;
|
| bool fCoverageIgnored;
|
| bool fHasColors;
|
| -
|
| - typedef GrVertexBatch INHERITED;
|
| };
|
|
|
| #endif
|
|
|