Revert of add a ClassID function to GrBatch

gm/beziereffects.cpp

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 // This test only works with the GPU backend.
 
@@ skipping 14 matching lines @@
 #include "effects/GrBezierEffect.h"
 
 static inline SkScalar eval_line(const SkPoint& p, const SkScalar lineEq[3], SkScalar sign) {
     return sign * (lineEq[0] * p.fX + lineEq[1] * p.fY + lineEq[2]);
 }
 
 namespace skiagm {
 
 class BezierCubicOrConicTestBatch : public GrTestBatch {
 public:
-    DEFINE_BATCH_CLASS_ID
     struct Geometry : public GrTestBatch::Geometry {
         SkRect fBounds;
     };
 
     const char* name() const override { return "BezierCubicOrConicTestBatch"; }
 
     static GrDrawBatch* Create(const GrGeometryProcessor* gp, const Geometry& geo,
                                const SkScalar klmEqs[9], SkScalar sign) {
         return new BezierCubicOrConicTestBatch(gp, geo, klmEqs, sign);
     }
 
 private:
     BezierCubicOrConicTestBatch(const GrGeometryProcessor* gp, const Geometry& geo,
                                 const SkScalar klmEqs[9], SkScalar sign)
-        : INHERITED(ClassID(), gp, geo.fBounds) {
+        : INHERITED(gp, geo.fBounds) {
+        this->initClassID<BezierCubicOrConicTestBatch>();
         for (int i = 0; i < 9; i++) {
             fKlmEqs[i] = klmEqs[i];
         }
 
         fGeometry = geo;
         fSign = sign;
     }
 
     struct Vertex {
         SkPoint fPosition;
@@ skipping 364 matching lines @@
         return conicCnt;
     }
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 class BezierQuadTestBatch : public GrTestBatch {
 public:
-    DEFINE_BATCH_CLASS_ID
     struct Geometry : public GrTestBatch::Geometry {
         SkRect fBounds;
     };
 
     const char* name() const override { return "BezierQuadTestBatch"; }
 
     static GrDrawBatch* Create(const GrGeometryProcessor* gp, const Geometry& geo,
                                const GrPathUtils::QuadUVMatrix& devToUV) {
         return new BezierQuadTestBatch(gp, geo, devToUV);
     }
 
 private:
     BezierQuadTestBatch(const GrGeometryProcessor* gp, const Geometry& geo,
                         const GrPathUtils::QuadUVMatrix& devToUV)
-        : INHERITED(ClassID(), gp, geo.fBounds)
+        : INHERITED(gp, geo.fBounds)
         , fGeometry(geo)
         , fDevToUV(devToUV) {
+        this->initClassID<BezierQuadTestBatch>();
     }
 
     struct Vertex {
         SkPoint fPosition;
         float   fKLM[4]; // The last value is ignored. The effect expects a vec4f.
     };
 
     Geometry* geoData(int index) override {
         SkASSERT(0 == index);
         return &fGeometry;
@@ skipping 167 matching lines @@
 private:
     typedef GM INHERITED;
 };
 
 DEF_GM(return new BezierCubicEffects;)
 DEF_GM(return new BezierConicEffects;)
 DEF_GM(return new BezierQuadEffects;)
 }
 
 #endif