| Index: src/gpu/batches/GrDefaultPathRenderer.cpp
|
| diff --git a/src/gpu/batches/GrDefaultPathRenderer.cpp b/src/gpu/batches/GrDefaultPathRenderer.cpp
|
| index 67bccb63b47346382bdd24487bd9f4ff99e98ac0..f4ce7c85a52bfc9ca818dad8f87e477e35033f2e 100644
|
| --- a/src/gpu/batches/GrDefaultPathRenderer.cpp
|
| +++ b/src/gpu/batches/GrDefaultPathRenderer.cpp
|
| @@ -211,8 +211,6 @@
|
|
|
| class DefaultPathBatch : public GrVertexBatch {
|
| public:
|
| - DEFINE_BATCH_CLASS_ID
|
| -
|
| struct Geometry {
|
| GrColor fColor;
|
| SkPath fPath;
|
| @@ -378,8 +376,8 @@
|
| SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
|
|
|
| DefaultPathBatch(const Geometry& geometry, uint8_t coverage, const SkMatrix& viewMatrix,
|
| - bool isHairline, const SkRect& devBounds)
|
| - : INHERITED(ClassID()) {
|
| + bool isHairline, const SkRect& devBounds) {
|
| + this->initClassID<DefaultPathBatch>();
|
| fBatch.fCoverage = coverage;
|
| fBatch.fIsHairline = isHairline;
|
| fBatch.fViewMatrix = viewMatrix;
|
| @@ -532,8 +530,6 @@
|
|
|
| BatchTracker fBatch;
|
| SkSTArray<1, Geometry, true> fGeoData;
|
| -
|
| - typedef GrVertexBatch INHERITED;
|
| };
|
|
|
| bool GrDefaultPathRenderer::internalDrawPath(GrDrawTarget* target,
|
|
|