Templatize GrNonAtomicRef

src/gpu/batches/GrBatch.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 GrBatch_DEFINED
 #define GrBatch_DEFINED
 
@@ skipping 35 matching lines @@
     #define GrBATCH_INFO(...)
 #endif
 
 // A helper macro to generate a class static id
 #define DEFINE_BATCH_CLASS_ID \
     static uint32_t ClassID() { \
         static uint32_t kClassID = GenBatchClassID(); \
         return kClassID; \
     }
 
-class GrBatch : public GrNonAtomicRef {
+class GrBatch : public GrNonAtomicRef<GrBatch> {
 public:
     GrBatch(uint32_t classID);
-    ~GrBatch() override;
+    virtual ~GrBatch();
 
     virtual const char* name() const = 0;
 
     bool combineIfPossible(GrBatch* that, const GrCaps& caps) {
         if (this->classID() != that->classID()) {
             return false;
         }
 
         return this->onCombineIfPossible(that, caps);
     }
@@ skipping 82 matching lines @@
     };
 
     SkDEBUGCODE(bool                    fUsed;)
     const uint32_t                      fClassID;
 #if GR_BATCH_SPEW
     static uint32_t GenBatchID() { return GenID(&gCurrBatchUniqueID); }
     const uint32_t                      fUniqueID;
     static int32_t                      gCurrBatchUniqueID;
 #endif
     static int32_t                      gCurrBatchClassID;
-    typedef GrNonAtomicRef INHERITED;
 };
 
 #endif