Index: src/gpu/GrResourceCache2.h |
diff --git a/src/gpu/GrResourceCache2.h b/src/gpu/GrResourceCache2.h |
index 5733cff66460bc476fe24560c7528141122b51c7..5aee1add86cc7f055314d5763cb883e912a50e50 100644 |
--- a/src/gpu/GrResourceCache2.h |
+++ b/src/gpu/GrResourceCache2.h |
@@ -110,7 +110,7 @@ public: |
/** |
* Find a resource that matches a content key. |
*/ |
- GrGpuResource* findAndRefContentResource(const GrResourceKey& contentKey) { |
+ GrGpuResource* findAndRefContentResource(const GrContentKey& contentKey) { |
GrGpuResource* resource = fContentHash.find(contentKey); |
if (resource) { |
resource->ref(); |
@@ -122,7 +122,7 @@ public: |
/** |
* Query whether a content key exists in the cache. |
*/ |
- bool hasContentKey(const GrResourceKey& contentKey) const { |
+ bool hasContentKey(const GrContentKey& contentKey) const { |
return SkToBool(fContentHash.find(contentKey)); |
} |
@@ -193,13 +193,13 @@ private: |
typedef SkTMultiMap<GrGpuResource, GrScratchKey, ScratchMapTraits> ScratchMap; |
struct ContentHashTraits { |
- static const GrResourceKey& GetKey(const GrGpuResource& r) { |
- return *r.cacheAccess().getContentKey(); |
+ static const GrContentKey& GetKey(const GrGpuResource& r) { |
+ return r.cacheAccess().getContentKey(); |
} |
- static uint32_t Hash(const GrResourceKey& key) { return key.getHash(); } |
+ static uint32_t Hash(const GrContentKey& key) { return key.hash(); } |
}; |
- typedef SkTDynamicHash<GrGpuResource, GrResourceKey, ContentHashTraits> ContentHash; |
+ typedef SkTDynamicHash<GrGpuResource, GrContentKey, ContentHashTraits> ContentHash; |
typedef SkTInternalLList<GrGpuResource> ResourceList; |