Index: src/gpu/batches/GrAAConvexPathRenderer.cpp |
diff --git a/src/gpu/batches/GrAAConvexPathRenderer.cpp b/src/gpu/batches/GrAAConvexPathRenderer.cpp |
index 75bf33279061ef3e0ad6cec712ee953b8a9eb20d..543885e54ff57c5fcca6b600801629cf2f5c3c5f 100644 |
--- a/src/gpu/batches/GrAAConvexPathRenderer.cpp |
+++ b/src/gpu/batches/GrAAConvexPathRenderer.cpp |
@@ -733,6 +733,7 @@ static const GrGeometryProcessor* create_fill_gp(bool tweakAlphaForCoverage, |
class AAConvexPathBatch : public GrVertexBatch { |
public: |
+ DEFINE_BATCH_CLASS_ID |
struct Geometry { |
GrColor fColor; |
SkMatrix fViewMatrix; |
@@ -752,7 +753,6 @@ public: |
} |
private: |
- |
void initBatchTracker(const GrPipelineOptimizations& opt) override { |
// Handle any color overrides |
if (!opt.readsColor()) { |
@@ -921,8 +921,7 @@ private: |
SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; } |
- AAConvexPathBatch(const Geometry& geometry) { |
- this->initClassID<AAConvexPathBatch>(); |
+ AAConvexPathBatch(const Geometry& geometry) : INHERITED(ClassID()) { |
fGeoData.push_back(geometry); |
// compute bounds |
@@ -979,6 +978,8 @@ private: |
BatchTracker fBatch; |
SkSTArray<1, Geometry, true> fGeoData; |
+ |
+ typedef GrVertexBatch INHERITED; |
}; |
bool GrAAConvexPathRenderer::onDrawPath(const DrawPathArgs& args) { |