Remove GrResourceKey from GrResourceCache

src/gpu/GrResourceCache2.cpp

 
 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrResourceCache2.h"
@@ skipping 77 matching lines @@
             return SkRef(resource);
         } else if (flags & kRequireNoPendingIO_ScratchFlag) {
             return NULL;
         }
         // TODO: fail here when kPrefer is specified, we didn't find a resource without pending io,
         // but there is still space in our budget for the resource.
     }
     return SkSafeRef(fScratchMap.find(scratchKey, AvailableForScratchUse(false)));
 }
 
+#if 0
 void GrResourceCache2::willRemoveContentKey(const GrGpuResource* resource) {
     SkASSERT(resource);
     SkASSERT(resource->getContentKey());
     SkDEBUGCODE(GrGpuResource* res = fContentHash.find(*resource->getContentKey()));
     SkASSERT(res == resource);
 
     fContentHash.remove(*resource->getContentKey());
 }
+#endif
 
-bool GrResourceCache2::didAddContentKey(GrGpuResource* resource) {
+bool GrResourceCache2::didSetContentKey(GrGpuResource* resource) {
     SkASSERT(resource);
     SkASSERT(resource->getContentKey());
+    SkASSERT(!resource->getContentKey()->isScratch());
 
     GrGpuResource* res = fContentHash.find(*resource->getContentKey());
     if (NULL != res) {
         return false;
     }
 
     fContentHash.add(resource);
     return true;
 }