Reland of add a ClassID function to GrBatch

src/gpu/batches/GrDrawPathBatch.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrDrawPathBatch_DEFINED
 #define GrDrawPathBatch_DEFINED
 
@@ skipping 12 matching lines @@
         out->setKnownFourComponents(fColor);
     }
 
     void getInvariantOutputCoverage(GrInitInvariantOutput* out) const override {
         out->setKnownSingleComponent(0xff);
     }
 
     void setStencilSettings(const GrStencilSettings& stencil) { fStencilSettings = stencil; }
 
 protected:
-    GrDrawPathBatchBase(const SkMatrix& viewMatrix, GrColor initialColor)
-        : fViewMatrix(viewMatrix)
+    GrDrawPathBatchBase(uint32_t classID, const SkMatrix& viewMatrix, GrColor initialColor)
+        : INHERITED(classID)
+        , fViewMatrix(viewMatrix)
         , fColor(initialColor) {}
 
     const GrStencilSettings& stencilSettings() const { return fStencilSettings; }
     const GrPipelineOptimizations& opts() const { return fOpts; }
     const SkMatrix& viewMatrix() const { return fViewMatrix; }
     GrColor color() const { return fColor; }
 
 private:
     void initBatchTracker(const GrPipelineOptimizations& opts) override {
         opts.getOverrideColorIfSet(&fColor);
         fOpts = opts;
     }
 
     SkMatrix                                                fViewMatrix;
     GrColor                                                 fColor;
     GrStencilSettings                                       fStencilSettings;
     GrPipelineOptimizations                                 fOpts;
 
     typedef GrDrawBatch INHERITED;
 };
 
 class GrDrawPathBatch final : public GrDrawPathBatchBase {
 public:
+    DEFINE_BATCH_CLASS_ID
+
     // This can't return a more abstract type because we install the stencil settings late :(
     static GrDrawPathBatchBase* Create(const SkMatrix& viewMatrix, GrColor color,
                                        const GrPath* path) {
         return new GrDrawPathBatch(viewMatrix, color, path);
     }
 
     const char* name() const override { return "DrawPath"; }
 
     SkString dumpInfo() const override;
 
 private:
     GrDrawPathBatch(const SkMatrix& viewMatrix, GrColor color, const GrPath* path)
-        : INHERITED(viewMatrix, color)
+        : INHERITED(ClassID(), viewMatrix, color)
         , fPath(path) {
         fBounds = path->getBounds();
         viewMatrix.mapRect(&fBounds);
-        this->initClassID<GrDrawPathBatch>();
     }
 
     bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override { return false; }
 
     void onPrepare(GrBatchFlushState*) override {}
 
     void onDraw(GrBatchFlushState* state) override;
 
     GrPendingIOResource<const GrPath, kRead_GrIOType> fPath;
 
@@ skipping 55 matching lines @@
     bool fUsedInBatch;
     friend class GrDrawPathRangeBatch;
 #endif
 
     typedef GrNonAtomicRef INHERITED;
 };
 
 // Template this if we decide to support index types other than 16bit
 class GrDrawPathRangeBatch final : public GrDrawPathBatchBase {
 public:
-    // This can't return a more abstracet type because we install the stencil settings late :(
+    DEFINE_BATCH_CLASS_ID
+
+    // This can't return a more abstract type because we install the stencil settings late :(
     static GrDrawPathBatchBase* Create(const SkMatrix& viewMatrix, const SkMatrix& localMatrix,
                                        GrColor color, GrPathRangeDraw* pathRangeDraw) {
         return SkNEW_ARGS(GrDrawPathRangeBatch, (viewMatrix, localMatrix, color, pathRangeDraw));
     }
 
     ~GrDrawPathRangeBatch() override;
 
     const char* name() const override { return "DrawPathRange"; }
 
     SkString dumpInfo() const override;
@@ skipping 12 matching lines @@
 
     typedef SkTLList<GrPathRangeDraw*> DrawList;
     DrawList    fDraws;
     int         fTotalPathCount;
     SkMatrix    fLocalMatrix;
 
     typedef GrDrawPathBatchBase INHERITED;
 };
 
 #endif