Simplify SkInstCnt

include/core/SkRefCnt.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkRefCnt_DEFINED
 #define SkRefCnt_DEFINED
 
 #include "SkDynamicAnnotations.h"
 #include "SkThread.h"
 #include "SkInstCnt.h"
 #include "SkTemplates.h"
 
 /** \class SkRefCntBase
 
     SkRefCntBase is the base class for objects that may be shared by multiple
     objects. When an existing owner wants to share a reference, it calls ref().
     When an owner wants to release its reference, it calls unref(). When the
     shared object's reference count goes to zero as the result of an unref()
     call, its (virtual) destructor is called. It is an error for the
     destructor to be called explicitly (or via the object going out of scope on
     the stack or calling delete) if getRefCnt() > 1.
 */
 class SK_API SkRefCntBase : SkNoncopyable {
 public:
-    SK_DECLARE_INST_COUNT_ROOT(SkRefCntBase)
+    SK_DECLARE_INST_COUNT(SkRefCntBase)
 
     /** Default construct, initializing the reference count to 1.
     */
     SkRefCntBase() : fRefCnt(1) {}
 
     /** Destruct, asserting that the reference count is 1.
     */
     virtual ~SkRefCntBase() {
 #ifdef SK_DEBUG
         SkASSERTF(fRefCnt == 1, "fRefCnt was %d", fRefCnt);
@@ skipping 231 matching lines @@
             SkDELETE((const Derived*)this);
         }
     }
     void  deref() const { this->unref(); }  // Chrome prefers to call deref().
 
 private:
     mutable int32_t fRefCnt;
 };
 
 #endif