Remove GrResourceKey from GrResourceCache

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 GrGpuResource_DEFINED
 #define GrGpuResource_DEFINED
 
@@ skipping 58 matching lines @@
 #endif
     }
 
 protected:
     GrIORef() : fRefCnt(1), fPendingReads(0), fPendingWrites(0) { }
 
     bool internalHasPendingRead() const { return SkToBool(fPendingReads); }
     bool internalHasPendingWrite() const { return SkToBool(fPendingWrites); }
     bool internalHasPendingIO() const { return SkToBool(fPendingWrites | fPendingReads); }
 
+    bool internalHasRef() const { return SkToBool(fRefCnt); }
+
 private:
     void addPendingRead() const {
         this->validate();
         ++fPendingReads;
     }
 
     void completedRead() const {
         this->validate();
         --fPendingReads;
         this->didUnref();
@@ skipping 76 matching lines @@
 
     /**
      * Retrieves the amount of GPU memory used by this resource in bytes. It is
      * approximate since we aren't aware of additional padding or copies made
      * by the driver.
      *
      * @return the amount of GPU memory used in bytes
      */
     virtual size_t gpuMemorySize() const = 0;
 
-    bool setCacheEntry(GrResourceCacheEntry* cacheEntry);
+    // TODO(bsalomon): Move this stuff to GrGpuResourcePriv.
+    bool setContentKey(const GrResourceKey& contentKey);
+    void setCacheEntry(GrResourceCacheEntry* cacheEntry);
     GrResourceCacheEntry* getCacheEntry() const { return fCacheEntry; }
     bool isScratch() const;
-
     /** 
      * If this resource can be used as a scratch resource this returns a valid
      * scratch key. Otherwise it returns a key for which isNullScratch is true.
+     * The resource may currently be used as content resource rather than scratch.
+     * Check isScratch().
      */
     const GrResourceKey& getScratchKey() const { return fScratchKey; }
-
     /** 
      * If this resource is currently cached by its contents then this will return
      * the content key. Otherwise, NULL is returned.
      */
     const GrResourceKey* getContentKey() const;
 
     /**
      * Gets an id that is unique for this GrGpuResource object. It is static in that it does
      * not change when the content of the GrGpuResource object changes. This will never return
      * 0.
@@ skipping 56 matching lines @@
          * free it).
          */
         kWrapped_FlagBit         = 0x1,
     };
 
     uint32_t                fFlags;
 
     GrResourceCacheEntry*   fCacheEntry;  // NULL if not in cache
     const uint32_t          fUniqueID;
 
+    // TODO(bsalomon): Remove GrResourceKey and use different simpler types for content and scratch
+    // keys.
     GrResourceKey           fScratchKey;
+    GrResourceKey           fContentKey;
+    bool                    fContentKeySet;
 
     typedef GrIORef<GrGpuResource> INHERITED;
     friend class GrIORef<GrGpuResource>; // to access notifyIsPurgable.
 };
 
 #endif