Reland of add a ClassID function to GrBatch

src/gpu/batches/GrClearBatch.h

Index: src/gpu/batches/GrClearBatch.h
diff --git a/src/gpu/batches/GrClearBatch.h b/src/gpu/batches/GrClearBatch.h
index f13b073d754b1762781e7b7b91f4314fa9711af5..b973dab5579e5c5c096044b4416f1e66afe95f61 100644
--- a/src/gpu/batches/GrClearBatch.h
+++ b/src/gpu/batches/GrClearBatch.h
@@ -15,11 +15,13 @@
 
 class GrClearBatch final : public GrBatch {
 public:
+    DEFINE_BATCH_CLASS_ID
+
     GrClearBatch(const SkIRect& rect,  GrColor color, GrRenderTarget* rt)
-        : fRect(rect)
+        : INHERITED(ClassID())
+        , fRect(rect)
         , fColor(color)
         , fRenderTarget(rt) {
-        this->initClassID<GrClearBatch>();
         fBounds = SkRect::Make(rect);
     }
 
@@ -50,15 +52,19 @@
     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)
-        : fRect(rect)
+        : INHERITED(ClassID())
+        , fRect(rect)
         , fInsideClip(insideClip)
         , fRenderTarget(rt) {
-        this->initClassID<GrClearStencilClipBatch>();
         fBounds = SkRect::Make(rect);
     }
 
@@ -86,6 +92,8 @@
     SkIRect                                                 fRect;
     bool                                                    fInsideClip;
     GrPendingIOResource<GrRenderTarget, kWrite_GrIOType>    fRenderTarget;
+
+    typedef GrBatch INHERITED;
 };
 
 #endif