Make GrResourceCache2 responsible for calling release, abandon, and ~.

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 18 matching lines @@
     } else {
         fFlags = 0;
     }
 }
 
 void GrGpuResource::registerWithCache() {
     get_resource_cache2(fGpu)->resourceAccess().insertResource(this);
 }
 
 GrGpuResource::~GrGpuResource() {
-    // subclass should have released this.
+    // The cache should have released or destroyed this resource.
     SkASSERT(this->wasDestroyed());
 }
 
 void GrGpuResource::release() { 
-    if (fGpu) {
-        this->onRelease();
-        get_resource_cache2(fGpu)->resourceAccess().removeResource(this);
-        fGpu = NULL;
-        fGpuMemorySize = 0;
-    }
+    SkASSERT(fGpu);
+    this->onRelease();
+    get_resource_cache2(fGpu)->resourceAccess().removeResource(this);
+    fGpu = NULL;
+    fGpuMemorySize = 0;
 }
 
 void GrGpuResource::abandon() {
-    if (fGpu) {
-        this->onAbandon();
-        get_resource_cache2(fGpu)->resourceAccess().removeResource(this);
-        fGpu = NULL;
-        fGpuMemorySize = 0;
-    }
+    SkASSERT(fGpu);
+    this->onAbandon();
+    get_resource_cache2(fGpu)->resourceAccess().removeResource(this);
+    fGpu = NULL;
+    fGpuMemorySize = 0;
 }
 
 const GrContext* GrGpuResource::getContext() const {
     if (fGpu) {
         return fGpu->getContext();
     } else {
         return NULL;
     }
 }
 
@@ skipping 14 matching lines @@
     SkASSERT(kInvalidGpuMemorySize != oldSize);
     fGpuMemorySize = kInvalidGpuMemorySize;
     get_resource_cache2(fGpu)->resourceAccess().didChangeGpuMemorySize(this, oldSize);
 }
 
 bool GrGpuResource::setContentKey(const GrResourceKey& contentKey) {
     // Currently this can only be called once and can't be called when the resource is scratch.
     SkASSERT(!contentKey.isScratch());
     SkASSERT(this->internalHasRef());
     
-    if (fContentKeySet) {
+    if (fContentKeySet || this->wasDestroyed()) {
         return false;
     }
 
     fContentKey = contentKey;
     fContentKeySet = true;
 
     if (!get_resource_cache2(fGpu)->resourceAccess().didSetContentKey(this)) {
         fContentKeySet = false;
         return false;
     }
     return true;
 }
 
 void GrGpuResource::notifyIsPurgable() const {
-    if (!this->wasDestroyed()) {
-        get_resource_cache2(fGpu)->resourceAccess().notifyPurgable(this);
+    if (this->wasDestroyed()) {
+        // We've already been removed from the cache. Goodbye cruel world!
+        SkDELETE(this);
+    } else {
+        GrGpuResource* mutableThis = const_cast<GrGpuResource*>(this);
+        get_resource_cache2(fGpu)->resourceAccess().notifyPurgable(mutableThis);
     }
 }
 
 void GrGpuResource::setScratchKey(const GrResourceKey& scratchKey) {
     SkASSERT(fScratchKey.isNullScratch());
     SkASSERT(scratchKey.isScratch());
     SkASSERT(!scratchKey.isNullScratch());
     fScratchKey = scratchKey;
 }
 
 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;
 }