Rename GrGpuObject to GrGpuResource

include/gpu/GrGpuResource.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 GrGpuObject_DEFINED
-#define GrGpuObject_DEFINED
+#ifndef GrGpuResource_DEFINED
+#define GrGpuResource_DEFINED
 
 #include "SkInstCnt.h"
 #include "SkTInternalLList.h"
 
 class GrResourceCacheEntry;
 class GrGpu;
 class GrContext;
 
 /**
  * Base class for objects that can be kept in the GrResourceCache.
  */
-class GrGpuObject : public SkNoncopyable {
+class GrGpuResource : public SkNoncopyable {
 public:
-    SK_DECLARE_INST_COUNT_ROOT(GrGpuObject)
+    SK_DECLARE_INST_COUNT_ROOT(GrGpuResource)
 
     // These method signatures are written to mirror SkRefCnt. However, we don't require
     // thread safety as GrCacheable objects are not intended to cross thread boundaries.
     // internal_dispose() exists because of GrTexture's reliance on it. It will be removed
     // soon.
     void ref() const { ++fRefCnt; }
     void unref() const { --fRefCnt; if (0 == fRefCnt) { this->internal_dispose(); } }
     virtual void internal_dispose() const { SkDELETE(this); }
     bool unique() const { return 1 == fRefCnt; }
 #ifdef SK_DEBUG
@@ skipping 48 matching lines @@
     GrResourceCacheEntry* getCacheEntry() { return fCacheEntry; }
 
     /**
      * Gets an id that is unique for this GrCacheable object. It is static in that it does
      * not change when the content of the GrCacheable object changes. This will never return
      * 0.
      */
     uint32_t getUniqueID() const { return fUniqueID; }
 
 protected:
-    GrGpuObject(GrGpu*, bool isWrapped);
-    virtual ~GrGpuObject();
+    GrGpuResource(GrGpu*, bool isWrapped);
+    virtual ~GrGpuResource();
 
     bool isInCache() const { return NULL != fCacheEntry; }
 
     GrGpu* getGpu() const { return fGpu; }
 
     // Derived classes should always call their parent class' onRelease
     // and onAbandon methods in their overrides.
     virtual void onRelease() {};
     virtual void onAbandon() {};
 
     bool isWrapped() const { return kWrapped_FlagBit & fFlags; }
 
     /**
      * This entry point should be called whenever gpuMemorySize() begins
      * reporting a different size. If the object is in the cache, it will call
      * gpuMemorySize() immediately and pass the new size on to the resource
      * cache.
      */
     void didChangeGpuMemorySize() const;
 
 private:
 #ifdef SK_DEBUG
     friend class GrGpu; // for assert in GrGpu to access getGpu
 #endif
 
     static uint32_t CreateUniqueID();
 
     // We're in an internal doubly linked list
-    SK_DECLARE_INTERNAL_LLIST_INTERFACE(GrGpuObject);
+    SK_DECLARE_INTERNAL_LLIST_INTERFACE(GrGpuResource);
 
     GrGpu*              fGpu;               // not reffed. The GrGpu can be deleted while there
-                                            // are still live GrGpuObjects. It will call
+                                            // are still live GrGpuResources. It will call
                                             // release() on all such objects in its destructor.
     enum Flags {
         /**
          * This object wraps a GPU object given to us by the user.
          * Lifetime management is left up to the user (i.e., we will not
          * free it).
          */
         kWrapped_FlagBit         = 0x1,
     };
 
     uint32_t                fFlags;
 
     mutable int32_t         fRefCnt;
     GrResourceCacheEntry*   fCacheEntry;  // NULL if not in cache
     const uint32_t          fUniqueID;
 
     typedef SkNoncopyable INHERITED;
 };
 
 #endif