Revert of add a ClassID function to GrBatch

src/gpu/batches/GrAAHairLinePathRenderer.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrAAHairLinePathRenderer.h"
 
 #include "GrBatchFlushState.h"
@@ skipping 654 matching lines @@
     }
     if (!first) {
         return tolDevBounds.contains(actualBounds);
     }
 
     return true;
 }
 
 class AAHairlineBatch : public GrVertexBatch {
 public:
-    DEFINE_BATCH_CLASS_ID
-
     struct Geometry {
         GrColor fColor;
         uint8_t fCoverage;
         SkMatrix fViewMatrix;
         SkPath fPath;
         SkIRect fDevClipBounds;
     };
 
     static GrDrawBatch* Create(const Geometry& geometry) { return new AAHairlineBatch(geometry); }
 
@@ skipping 24 matching lines @@
     }
 
     SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
 
     void onPrepareDraws(Target*) override;
 
     typedef SkTArray<SkPoint, true> PtArray;
     typedef SkTArray<int, true> IntArray;
     typedef SkTArray<float, true> FloatArray;
 
-    AAHairlineBatch(const Geometry& geometry) : INHERITED(ClassID()) {
+    AAHairlineBatch(const Geometry& geometry) {
+        this->initClassID<AAHairlineBatch>();
         fGeoData.push_back(geometry);
 
         // compute bounds
         fBounds = geometry.fPath.getBounds();
         geometry.fViewMatrix.mapRect(&fBounds);
 
         // This is b.c. hairlines are notionally infinitely thin so without expansion
         // two overlapping lines could be reordered even though they hit the same pixels.
         fBounds.outset(0.5f, 0.5f);
     }
@@ skipping 47 matching lines @@
         GrColor fColor;
         uint8_t fCoverage;
         SkRect fDevBounds;
         bool fUsesLocalCoords;
         bool fColorIgnored;
         bool fCoverageIgnored;
     };
 
     BatchTracker fBatch;
     SkSTArray<1, Geometry, true> fGeoData;
-
-    typedef GrVertexBatch INHERITED;
 };
 
 void AAHairlineBatch::onPrepareDraws(Target* target) {
     // Setup the viewmatrix and localmatrix for the GrGeometryProcessor.
     SkMatrix invert;
     if (!this->viewMatrix().invert(&invert)) {
         return;
     }
 
     // we will transform to identity space if the viewmatrix does not have perspective
@@ skipping 191 matching lines @@
     GrColor color = GrRandomColor(random);
     SkMatrix viewMatrix = GrTest::TestMatrix(random);
     GrStrokeInfo stroke(SkStrokeRec::kHairline_InitStyle);
     SkPath path = GrTest::TestPath(random);
     SkIRect devClipBounds;
     devClipBounds.setEmpty();
     return create_hairline_batch(color, viewMatrix, path, stroke, devClipBounds);
 }
 
 #endif