Simplify SkInstCnt

include/gpu/GrGpuResourceRef.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGpuResourceRef_DEFINED
 #define GrGpuResourceRef_DEFINED
 
@@ skipping 18 matching lines @@
  * valid way of going from state 3 back to 2 or 1.
  *
  * Like SkAutoTUnref, its constructor and setter adopt a ref from their caller.
  *
  * TODO: Once GrDODrawState no longer exists and therefore GrDrawState and GrOptDrawState no
  * longer share an instance of this class, attempt to make the resource owned by GrGpuResourceRef
  * only settable via the constructor.
  */
 class GrGpuResourceRef : SkNoncopyable {
 public:
-    SK_DECLARE_INST_COUNT_ROOT(GrGpuResourceRef);
+    SK_DECLARE_INST_COUNT(GrGpuResourceRef);
 
     ~GrGpuResourceRef();
 
     GrGpuResource* getResource() const { return fResource; }
 
     /** Does this object own a pending read or write on the resource it is wrapping. */
     bool ownsPendingIO() const { return fPendingIO; }
 
     /** Shortcut for calling setResource() with NULL. It cannot be called after markingPendingIO
         is called. */
@@ skipping 30 matching lines @@
     friend class GrProgramElement;
 
     GrGpuResource*  fResource;
     mutable bool    fOwnRef;
     mutable bool    fPendingIO;
     GrIOType        fIOType;
 
     typedef SkNoncopyable INHERITED;
 };
 
-/** 
+/**
  * Templated version of GrGpuResourceRef to enforce type safety.
  */
 template <typename T> class GrTGpuResourceRef : public GrGpuResourceRef {
 public:
     GrTGpuResourceRef() {}
 
     /** Adopts a ref from the caller. ioType expresses what type of IO operations will be marked as
         pending on the resource when markPendingIO is called. */
     GrTGpuResourceRef(T* resource, GrIOType ioType) : INHERITED(resource, ioType) { }
 
@@ skipping 101 matching lines @@
                     fResource->completedRead();
                     fResource->completedWrite();
                     break;
             }
         }
     }
 
     T* fResource;
 };
 #endif