Revert of add a ClassID function to GrBatch

gm/convexpolyeffect.cpp

 
 /*
  * Copyright 2014 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 13 matching lines @@
 
 #include "batches/GrTestBatch.h"
 #include "batches/GrVertexBatch.h"
 
 #include "effects/GrConvexPolyEffect.h"
 
 namespace skiagm {
 
 class ConvexPolyTestBatch : public GrTestBatch {
 public:
-    DEFINE_BATCH_CLASS_ID
     struct Geometry : public GrTestBatch::Geometry {
         SkRect fBounds;
     };
 
     const char* name() const override { return "ConvexPolyTestBatch"; }
 
     static GrDrawBatch* Create(const GrGeometryProcessor* gp, const Geometry& geo) {
         return new ConvexPolyTestBatch(gp, geo);
     }
 
 private:
     ConvexPolyTestBatch(const GrGeometryProcessor* gp, const Geometry& geo)
-        : INHERITED(ClassID(), gp, geo.fBounds)
+        : INHERITED(gp, geo.fBounds)
         , fGeometry(geo) {
+        this->initClassID<ConvexPolyTestBatch>();
     }
 
     Geometry* geoData(int index) override {
         SkASSERT(0 == index);
         return &fGeometry;
     }
 
     const Geometry* geoData(int index) const override {
         SkASSERT(0 == index);
         return &fGeometry;
@@ skipping 213 matching lines @@
     SkTLList<SkPath> fPaths;
     SkTLList<SkRect> fRects;
 
     typedef GM INHERITED;
 };
 
 DEF_GM(return new ConvexPolyEffect;)
 }
 
 #endif