Add GrGpuResource::CacheAccess

src/gpu/GrGpuResourceCacheAccess.h

Index: src/gpu/GrGpuResourceCacheAccess.h
diff --git a/src/gpu/GrGpuResourceCacheAccess.h b/src/gpu/GrGpuResourceCacheAccess.h
new file mode 100644
index 0000000000000000000000000000000000000000..b213fe7e25cfc18f24b26cc64d6c6b383ad5080f
--- /dev/null
+++ b/src/gpu/GrGpuResourceCacheAccess.h
@@ -0,0 +1,92 @@
+
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrGpuResourceCacheAccess_DEFINED
+#define GrGpuResourceCacheAccess_DEFINED
+
+#include "GrGpuResource.h"
+

[robertphillips, 2014/11/11 15:20:52]

// This class acts as a chokepoint for resource cache access ...

?

[bsalomon, 2014/11/11 15:32:26]

Done.

+class GrGpuResource::CacheAccess {
+public:
+    /**
+     * Sets a content key for the resource. If the resource was previously cached as scratch it will
+     * be converted to a content resource. Currently this may only be called once per resource. It
+     * fails if there is already a resource with the same content key. TODO: make this supplant the
+     * resource that currently is using the content key, allow resources' content keys to change,
+     * and allow removal of a content key to convert a resource back to scratch.
+     */
+    bool setContentKey(const GrResourceKey& contentKey) {
+        return fResource->setContentKey(contentKey);
+    }
+
+    /**
+     * Used by legacy cache to attach a cache entry. This is to be removed soon.
+     */
+    void setCacheEntry(GrResourceCacheEntry* cacheEntry) {
+        // GrResourceCache never changes the cacheEntry once one has been added.
+        SkASSERT(NULL == cacheEntry || NULL == fResource->fCacheEntry);
+        fResource->fCacheEntry = cacheEntry;
+    }
+
+    /**
+     * Is the resource in the legacy cache? This is to be removed soon.
+     */
+    bool isInCache() const { return SkToBool(fResource->fCacheEntry); }
+
+    /**
+     * Returns the cache entry for the legacy cache. This is to be removed soon.
+     */
+    GrResourceCacheEntry* getCacheEntry() const { return fResource->fCacheEntry; }
+
+    /**
+     * Is the resource currently cached as scratch? This means it has a valid scratch key and does
+     * not have a content key.
+     */
+    bool isScratch() const {
+        SkASSERT(fResource->fScratchKey.isScratch());
+        return NULL == this->getContentKey() && !fResource->fScratchKey.isNullScratch();
+    }
+

[robertphillips, 2014/11/11 15:20:51]

extra space ?

[bsalomon, 2014/11/11 15:32:26]

Done.

+     /** 
+     * If this resource can be used as a scratch resource this returns a valid scratch key.
+     * Otherwise it returns a key for which isNullScratch is true. The resource may currently be
+     * used as content resource rather than scratch. Check isScratch().
+     */

[robertphillips, 2014/11/11 15:20:52]

if (fResource->gContentKeySet) {
  return nullScratchKey;
}
return fResource->fScratchKey;

?

[bsalomon, 2014/11/11 15:32:26]

We sometimes need to access the scratch key even when it is content-cached. I
tried to make it clear in the comment say "can be used as a scratch" and pointed
to the isScratch() function.

+    const GrResourceKey& getScratchKey() const { return fResource->fScratchKey; }
+
+    /**
+     * If the resource is currently cached by a content key, the key is returned, otherwise NULL.
+     */
+    const GrResourceKey* getContentKey() const {
+        if (fResource->fContentKeySet) {
+            return &fResource->fContentKey;
+        }
+        return NULL;
+    }
+
+private:
+    CacheAccess(GrGpuResource* resource) : fResource(resource) { }
+    CacheAccess(const CacheAccess& that) : fResource(that.fResource) { }
+    CacheAccess& operator=(const CacheAccess&); // unimpl
+
+    // No taking addresses of this type.
+    const CacheAccess* operator&() const;
+    CacheAccess* operator&();
+
+    GrGpuResource* fResource;
+
+    friend class GrGpuResource; // to construct/copy this type.
+};
+
+inline GrGpuResource::CacheAccess GrGpuResource::cacheAccess() { return CacheAccess(this); }
+
+inline const GrGpuResource::CacheAccess GrGpuResource::cacheAccess() const {
+    return CacheAccess(const_cast<GrGpuResource*>(this));
+}
+
+#endif