Revert of add a ClassID function to GrBatch

src/gpu/batches/GrDefaultPathRenderer.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 "GrDefaultPathRenderer.h"
 
 #include "GrBatchFlushState.h"
@@ skipping 193 matching lines @@
     if (indexed) {
         for (uint16_t i = 0; i < numPts; ++i) {
             append_countour_edge_indices(isHairline, subpathIdxStart,
                                          firstQPtIdx + i, idx);
         }
     }
 }
 
 class DefaultPathBatch : public GrVertexBatch {
 public:
-    DEFINE_BATCH_CLASS_ID
-
     struct Geometry {
         GrColor fColor;
         SkPath fPath;
         SkScalar fTolerance;
     };
 
     static GrDrawBatch* Create(const Geometry& geometry, uint8_t coverage,
                                const SkMatrix& viewMatrix, bool isHairline,
                                const SkRect& devBounds) {
         return new DefaultPathBatch(geometry, coverage, viewMatrix, isHairline, devBounds);
@@ skipping 145 matching lines @@
         target->draw(vertices);
 
         // put back reserves
         target->putBackIndices((size_t)(maxIndices - indexOffset));
         target->putBackVertices((size_t)(maxVertices - vertexOffset), (size_t)vertexStride);
     }
 
     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;
         fGeoData.push_back(geometry);
 
         this->setBounds(devBounds);
     }
 
     bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override {
         DefaultPathBatch* that = t->cast<DefaultPathBatch>();
@@ skipping 132 matching lines @@
         uint8_t fCoverage;
         SkMatrix fViewMatrix;
         bool fUsesLocalCoords;
         bool fColorIgnored;
         bool fCoverageIgnored;
         bool fIsHairline;
     };
 
     BatchTracker fBatch;
     SkSTArray<1, Geometry, true> fGeoData;
-
-    typedef GrVertexBatch INHERITED;
 };
 
 bool GrDefaultPathRenderer::internalDrawPath(GrDrawTarget* target,
                                              GrPipelineBuilder* pipelineBuilder,
                                              GrColor color,
                                              const SkMatrix& viewMatrix,
                                              const SkPath& path,
                                              const GrStrokeInfo& origStroke,
                                              bool stencilOnly) {
     SkTCopyOnFirstWrite<GrStrokeInfo> stroke(origStroke);
@@ skipping 209 matching lines @@
     geometry.fColor = color;
     geometry.fPath = path;
     geometry.fTolerance = srcSpaceTol;
 
     viewMatrix.mapRect(&bounds);
     uint8_t coverage = GrRandomCoverage(random);
     return DefaultPathBatch::Create(geometry, coverage, viewMatrix, true, bounds);
 }
 
 #endif