Add specialized content key class for 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"
 #include "GrResourceCache2.h"
 #include "GrGpu.h"
 
 static inline GrResourceCache2* get_resource_cache2(GrGpu* gpu) {
     SkASSERT(gpu);
     SkASSERT(gpu->getContext());
     SkASSERT(gpu->getContext()->getResourceCache2());
     return gpu->getContext()->getResourceCache2();
 }
 
 GrGpuResource::GrGpuResource(GrGpu* gpu, LifeCycle lifeCycle)
     : fGpu(gpu)
     , fGpuMemorySize(kInvalidGpuMemorySize)
-    , fFlags(0)
     , fLifeCycle(lifeCycle)
     , fUniqueID(CreateUniqueID()) {
 }
 
 void GrGpuResource::registerWithCache() {
     get_resource_cache2(fGpu)->resourceAccess().insertResource(this);
 }
 
 GrGpuResource::~GrGpuResource() {
     // The cache should have released or destroyed this resource.
@@ skipping 42 matching lines @@
     if (this->wasDestroyed()) {
         return;
     }
 
     size_t oldSize = fGpuMemorySize;
     SkASSERT(kInvalidGpuMemorySize != oldSize);
     fGpuMemorySize = kInvalidGpuMemorySize;
     get_resource_cache2(fGpu)->resourceAccess().didChangeGpuMemorySize(this, oldSize);
 }
 
-bool GrGpuResource::setContentKey(const GrResourceKey& contentKey) {
+bool GrGpuResource::setContentKey(const GrContentKey& key) {
     // Currently this can only be called once and can't be called when the resource is scratch.
     SkASSERT(this->internalHasRef());
 
     // Wrapped resources can never have a key.
     if (this->isWrapped()) {
         return false;
     }
 
-    if ((fFlags & kContentKeySet_Flag) || this->wasDestroyed()) {
+    if (fContentKey.isValid() || this->wasDestroyed()) {
         return false;
     }
 
-    fContentKey = contentKey;
-    fFlags |= kContentKeySet_Flag;
+    fContentKey = key;
 
     if (!get_resource_cache2(fGpu)->resourceAccess().didSetContentKey(this)) {
-         fFlags &= ~kContentKeySet_Flag;
+        fContentKey.reset();
         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 {
@@ skipping 27 matching lines @@
 }
 
 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;
 }