Use GrResourceCache2 to service content key lookups

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 60 matching lines @@
 }
 
 GrContext* GrGpuResource::getContext() {
     if (fGpu) {
         return fGpu->getContext();
     } else {
         return NULL;
     }
 }
 
+bool 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;
+    }
+

[robertphillips, 2014/11/07 20:32:13]

Delete this next line ?

[bsalomon, 2014/11/07 21:48:44]

Done.

+    fCacheEntry = cacheEntry;
+    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();
     }
     return NULL;
 }
 
 bool GrGpuResource::isScratch() const {
-    // Currently scratch resources have a cache entry in GrResourceCache with a scratch key.
-    return NULL != fCacheEntry && fCacheEntry->key().isScratch();
+    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;
 }