Index: src/gpu/batches/GrDrawPathBatch.h |
diff --git a/src/gpu/batches/GrDrawPathBatch.h b/src/gpu/batches/GrDrawPathBatch.h |
index 228ad86617f234d40b892fb295a1883a350c7e23..71ef9d42b482de9dc5f5002c986162011fb894ed 100644 |
--- a/src/gpu/batches/GrDrawPathBatch.h |
+++ b/src/gpu/batches/GrDrawPathBatch.h |
@@ -30,9 +30,8 @@ |
void setStencilSettings(const GrStencilSettings& stencil) { fStencilSettings = stencil; } |
protected: |
- GrDrawPathBatchBase(uint32_t classID, const SkMatrix& viewMatrix, GrColor initialColor) |
- : INHERITED(classID) |
- , fViewMatrix(viewMatrix) |
+ GrDrawPathBatchBase(const SkMatrix& viewMatrix, GrColor initialColor) |
+ : fViewMatrix(viewMatrix) |
, fColor(initialColor) {} |
const GrStencilSettings& stencilSettings() const { return fStencilSettings; } |
@@ -56,8 +55,6 @@ |
class GrDrawPathBatch final : public GrDrawPathBatchBase { |
public: |
- DEFINE_BATCH_CLASS_ID |
- |
// This can't return a more abstract type because we install the stencil settings late :( |
static GrDrawPathBatchBase* Create(const SkMatrix& viewMatrix, GrColor color, |
const GrPath* path) { |
@@ -70,10 +67,11 @@ |
private: |
GrDrawPathBatch(const SkMatrix& viewMatrix, GrColor color, const GrPath* path) |
- : INHERITED(ClassID(), viewMatrix, color) |
+ : INHERITED(viewMatrix, color) |
, fPath(path) { |
fBounds = path->getBounds(); |
viewMatrix.mapRect(&fBounds); |
+ this->initClassID<GrDrawPathBatch>(); |
} |
bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override { return false; } |
@@ -149,9 +147,7 @@ |
// Template this if we decide to support index types other than 16bit |
class GrDrawPathRangeBatch final : public GrDrawPathBatchBase { |
public: |
- DEFINE_BATCH_CLASS_ID |
- |
- // This can't return a more abstract type because we install the stencil settings late :( |
+ // This can't return a more abstracet type because we install the stencil settings late :( |
static GrDrawPathBatchBase* Create(const SkMatrix& viewMatrix, const SkMatrix& localMatrix, |
GrColor color, GrPathRangeDraw* pathRangeDraw) { |
return SkNEW_ARGS(GrDrawPathRangeBatch, (viewMatrix, localMatrix, color, pathRangeDraw)); |