Correct accounting for wrapped resources

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 69 matching lines @@
     size_t oldSize = fGpuMemorySize;
     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());
+
+    // Wrapped resources can never have a key.
+    if (this->isWrapped()) {
+        return false;
+    }
     
     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()) {
         // 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());
+    // Wrapped resources can never have a key.
+    if (this->isWrapped()) {
+        return;
+    }
     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;
 }