Revert of add a ClassID function to GrBatch

src/gpu/batches/GrClearBatch.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 GrClearBatch_DEFINED
 #define GrClearBatch_DEFINED
 
 #include "GrBatch.h"
 #include "GrBatchFlushState.h"
 #include "GrGpu.h"
 #include "GrRenderTarget.h"
 
 class GrClearBatch final : public GrBatch {
 public:
-    DEFINE_BATCH_CLASS_ID
-
     GrClearBatch(const SkIRect& rect,  GrColor color, GrRenderTarget* rt)
-        : INHERITED(ClassID())
-        , fRect(rect)
+        : fRect(rect)
         , fColor(color)
         , fRenderTarget(rt) {
+        this->initClassID<GrClearBatch>();
         fBounds = SkRect::Make(rect);
     }
 
     const char* name() const override { return "Clear"; }
 
     uint32_t renderTargetUniqueID() const override { return fRenderTarget.get()->getUniqueID(); }
 
     SkString dumpInfo() const override {
         SkString string;
         string.printf("Color: 0x%08x, Rect [L: %d, T: %d, R: %d, B: %d], RT: 0x%p",
@@ skipping 10 matching lines @@
 
     void onPrepare(GrBatchFlushState*) override {}
 
     void onDraw(GrBatchFlushState* state) override {
         state->gpu()->clear(fRect, fColor, fRenderTarget.get());
     }
 
     SkIRect                                                 fRect;
     GrColor                                                 fColor;
     GrPendingIOResource<GrRenderTarget, kWrite_GrIOType>    fRenderTarget;
-
-    typedef GrBatch INHERITED;
 };
 
 class GrClearStencilClipBatch final : public GrBatch {
 public:
-    DEFINE_BATCH_CLASS_ID
-
     GrClearStencilClipBatch(const SkIRect& rect, bool insideClip, GrRenderTarget* rt)
-        : INHERITED(ClassID())
-        , fRect(rect)
+        : fRect(rect)
         , fInsideClip(insideClip)
         , fRenderTarget(rt) {
+        this->initClassID<GrClearStencilClipBatch>();
         fBounds = SkRect::Make(rect);
     }
 
     const char* name() const override { return "ClearStencilClip"; }
 
     uint32_t renderTargetUniqueID() const override { return fRenderTarget.get()->getUniqueID(); }
 
     SkString dumpInfo() const override {
         SkString string;
         string.printf("Rect [L: %d, T: %d, R: %d, B: %d], IC: %d, RT: 0x%p",
                       fRect.fLeft, fRect.fTop, fRect.fRight, fRect.fBottom, fInsideClip,
                       fRenderTarget.get());
         return string;
     }
 
 private:
     bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override { return false; }
 
     void onPrepare(GrBatchFlushState*) override {}
 
     void onDraw(GrBatchFlushState* state) override {
         state->gpu()->clearStencilClip(fRect, fInsideClip, fRenderTarget.get());
     }
 
     SkIRect                                                 fRect;
     bool                                                    fInsideClip;
     GrPendingIOResource<GrRenderTarget, kWrite_GrIOType>    fRenderTarget;
-
-    typedef GrBatch INHERITED;
 };
 
 #endif