Reland of add a ClassID function to GrBatch

src/gpu/batches/GrAAStrokeRectBatch.h

Index: src/gpu/batches/GrAAStrokeRectBatch.h
diff --git a/src/gpu/batches/GrAAStrokeRectBatch.h b/src/gpu/batches/GrAAStrokeRectBatch.h
index ae7534823b421c2c19baa36b1fa8847995a3ebb4..fad5bd9d8df8293fe8465a4207a7ccb39ad787d8 100644
--- a/src/gpu/batches/GrAAStrokeRectBatch.h
+++ b/src/gpu/batches/GrAAStrokeRectBatch.h
@@ -18,6 +18,8 @@
 
 class GrAAStrokeRectBatch : public GrVertexBatch {
 public:
+    DEFINE_BATCH_CLASS_ID
+
     // TODO support AA rotated stroke rects by copying around view matrices
     struct Geometry {
         GrColor fColor;
@@ -48,8 +50,8 @@
     void onPrepareDraws(Target*) override;
     void initBatchTracker(const GrPipelineOptimizations&) override;
 
-    GrAAStrokeRectBatch(const Geometry& geometry, const SkMatrix& viewMatrix)  {
-        this->initClassID<GrAAStrokeRectBatch>();
+    GrAAStrokeRectBatch(const Geometry& geometry, const SkMatrix& viewMatrix)
+        : INHERITED(ClassID()) {
         fBatch.fViewMatrix = viewMatrix;
         fGeoData.push_back(geometry);
 
@@ -105,6 +107,8 @@
 
     BatchTracker fBatch;
     SkSTArray<1, Geometry, true> fGeoData;
+
+    typedef GrVertexBatch INHERITED;
 };