Remove GrResourceKey from GrResourceCache

src/gpu/GrGpuResource.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrGpuResource.h"
@@ skipping 11 matching lines @@
     SkASSERT(gpu);
     SkASSERT(gpu->getContext());
     SkASSERT(gpu->getContext()->getResourceCache());
     return gpu->getContext()->getResourceCache();
 }
 
 GrGpuResource::GrGpuResource(GrGpu* gpu, bool isWrapped)
     : fGpu(gpu)
     , fCacheEntry(NULL)
     , fUniqueID(CreateUniqueID())
-    , fScratchKey(GrResourceKey::NullScratchKey()) {
+    , fScratchKey(GrResourceKey::NullScratchKey())
+    , fContentKeySet(false) {
     if (isWrapped) {
         fFlags = kWrapped_FlagBit;
     } else {
         fFlags = 0;
     }
 }
 
 void GrGpuResource::registerWithCache() {
     get_resource_cache2(fGpu)->insertResource(this);
 }
@@ skipping 28 matching lines @@
 }
 
 GrContext* GrGpuResource::getContext() {
     if (fGpu) {
         return fGpu->getContext();
     } else {
         return NULL;
     }
 }
 
-bool GrGpuResource::setCacheEntry(GrResourceCacheEntry* cacheEntry) {
+bool GrGpuResource::setContentKey(const GrResourceKey& contentKey) {
+    SkASSERT(!contentKey.isScratch());
+    // Currently this can only be called once and can't be called when the resource is scratch.
+    SkASSERT(this->internalHasRef());
+    SkASSERT(!this->internalHasPendingIO());
+    
+    if (fContentKeySet) {

[robertphillips, 2014/11/11 15:04:44]

Assert in here?

[bsalomon, 2014/11/11 15:17:22]

Unit tests exercise this behavior.

+        return false;
+    }
+
+    fContentKey = contentKey;
+    fContentKeySet = true;
+
+    if (!get_resource_cache2(fGpu)->didSetContentKey(this)) {
+        fContentKeySet = false;
+        return false;
+    }
+    return true;
+}
+
+void GrGpuResource::setCacheEntry(GrResourceCacheEntry* cacheEntry) {
     // GrResourceCache never changes the cacheEntry once one has been added.
     SkASSERT(NULL == cacheEntry || NULL == fCacheEntry);
-
     fCacheEntry = cacheEntry;
-    if (this->wasDestroyed() || NULL == cacheEntry) {
-        return true;
-    }
-
-    if (!cacheEntry->key().isScratch()) {
-        if (!get_resource_cache2(fGpu)->didAddContentKey(this)) {
-            fCacheEntry = NULL;
-            return false;
-        }
-    }
-    return true;
 }
 
 void GrGpuResource::notifyIsPurgable() const {
     if (fCacheEntry && !this->wasDestroyed()) {
         get_resource_cache(fGpu)->notifyPurgable(this);
     }
 }
 
 void GrGpuResource::setScratchKey(const GrResourceKey& scratchKey) {
     SkASSERT(fScratchKey.isNullScratch());
     SkASSERT(scratchKey.isScratch());
     SkASSERT(!scratchKey.isNullScratch());
     fScratchKey = scratchKey;
 }
 
 const GrResourceKey* GrGpuResource::getContentKey() const {
-    // Currently scratch resources have a cache entry in GrResourceCache with a scratch key.
-    if (fCacheEntry && !fCacheEntry->key().isScratch()) {
-        return &fCacheEntry->key();
+    if (fContentKeySet) {
+        return &fContentKey;
     }
     return NULL;
 }
 
 bool GrGpuResource::isScratch() const {
     SkASSERT(fScratchKey.isScratch());
     return NULL == this->getContentKey() && !fScratchKey.isNullScratch();
 }
 
 uint32_t GrGpuResource::CreateUniqueID() {
     static int32_t gUniqueID = SK_InvalidUniqueID;
     uint32_t id;
     do {
         id = static_cast<uint32_t>(sk_atomic_inc(&gUniqueID) + 1);
     } while (id == SK_InvalidUniqueID);
     return id;
 }