Remove GrResourceKey from GrResourceCache

src/gpu/GrResourceCache2.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 GrResourceCache2_DEFINED
 #define GrResourceCache2_DEFINED
@@ skipping 11 matching lines @@
  */
 class GrResourceCache2 {
 public:
     GrResourceCache2() : fCount(0) {};
     ~GrResourceCache2();
 
     void insertResource(GrGpuResource*);
 
     void removeResource(GrGpuResource*);
 
-    void willRemoveContentKey(const GrGpuResource*);
-
     // This currently returns a bool and fails when an existing resource has a key that collides
     // with the new content key. In the future it will null out the content key for the existing
     // resource. The failure is a temporary measure taken because duties are split between two
     // cache objects currently.
-    bool didAddContentKey(GrGpuResource*);
+    bool didSetContentKey(GrGpuResource*);
 
     void abandonAll();
 
     void releaseAll();
 
     enum {
         /** Preferentially returns scratch resources with no pending IO. */
         kPreferNoPendingIO_ScratchFlag = 0x1,
         /** Will not return any resources that match but have pending IO. */
         kRequireNoPendingIO_ScratchFlag = 0x2,
     };
     GrGpuResource* findAndRefScratchResource(const GrResourceKey& scratchKey, uint32_t flags = 0);
     
 #ifdef SK_DEBUG
-    // This is not particularly fast and only used for validation, so debug only.
+    // Not particularly fast and only used for validation, so debug-only
     int countScratchEntriesForKey(const GrResourceKey& scratchKey) const {
         SkASSERT(scratchKey.isScratch());
         return fScratchMap.countForKey(scratchKey);
     }
 #endif
 
     GrGpuResource* findAndRefContentResource(const GrResourceKey& contentKey) {
         SkASSERT(!contentKey.isScratch());
         return SkSafeRef(fContentHash.find(contentKey));
     }
@@ skipping 30 matching lines @@
 
     int                                 fCount;
     SkTInternalLList<GrGpuResource>     fResources;
     // This map holds all resources that can be used as scratch resources.
     ScratchMap                          fScratchMap;
     // This holds all resources that have content keys.
     ContentHash                         fContentHash;
 };
 
 #endif