Allow GrGpuResources' unique keys to be changed.

src/gpu/GrGpuResourcePriv.h

 
 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGpuResourcePriv_DEFINED
 #define GrGpuResourcePriv_DEFINED
 
 #include "GrGpuResource.h"
 
 /**
  * This class allows code internal to Skia privileged access to manage the cache keys and budget
  * status of a GrGpuResource object.
  */
 class GrGpuResource::ResourcePriv {
 public:
     /**
      * Sets a unique key for the resource. If the resource was previously cached as scratch it will
-     * be converted to a uniquely-keyed resource. Currently this may only be called once per
-     * resource. It fails if there is already a resource with the same unique key. TODO: make this
-     * supplant the resource that currently is using the unique key, allow resources' unique keys
-     * to change, and allow removal of a unique key to convert a resource back to scratch.
+     * be converted to a uniquely-keyed resource. If the key is invalid then this is equivalent to
+     * removeUniqueKey(). If another resource is using the key then its unique key is removed and
+     * this resource takes over the key.
      */
-    bool setUniqueKey(const GrUniqueKey& key) {
-        return fResource->setUniqueKey(key);
-    }
+    void setUniqueKey(const GrUniqueKey& key) { fResource->setUniqueKey(key); }
 
-    /** Removes the unique key from a resource */
-    void removeUniqueKey() { return fResource->removeUniqueKey(); }
+    /** Removes the unique key from a resource. If the resource has a scratch key, it may be
+        preserved for recycling as scratch. */
+    void removeUniqueKey() { fResource->removeUniqueKey(); }
 
     /**
      * If the resource is uncached make it cached. Has no effect on resources that are wrapped or
      * already cached.
      */
     void makeBudgeted() { fResource->makeBudgeted(); }
 
     /**
      * If the resource is cached make it uncached. Has no effect on resources that are wrapped or
      * already uncached. Furthermore, resources with unique keys cannot be made unbudgeted.
@@ skipping 36 matching lines @@
     friend class GrGpuResource; // to construct/copy this type.
 };
 
 inline GrGpuResource::ResourcePriv GrGpuResource::resourcePriv() { return ResourcePriv(this); }
 
 inline const GrGpuResource::ResourcePriv GrGpuResource::resourcePriv() const {
     return ResourcePriv(const_cast<GrGpuResource*>(this));
 }
 
 #endif