make getContentKey() available in GrGpuResource public interface
TBR=robertphillips@google.com
Committed: https://skia.googlesource.com/skia/+/85ed2db092e75db41b711b9116a8d5b465fc2b0c
Review URL: https://codereview.chromium.org/886313005
diff --git a/src/gpu/GrResourceCache2.cpp b/src/gpu/GrResourceCache2.cpp
index 65894d3..99c4270 100644
--- a/src/gpu/GrResourceCache2.cpp
+++ b/src/gpu/GrResourceCache2.cpp
@@ -132,8 +132,8 @@
if (resource->cacheAccess().getScratchKey().isValid()) {
fScratchMap.remove(resource->cacheAccess().getScratchKey(), resource);
}
- if (resource->cacheAccess().getContentKey().isValid()) {
- fContentHash.remove(resource->cacheAccess().getContentKey());
+ if (resource->getContentKey().isValid()) {
+ fContentHash.remove(resource->getContentKey());
}
this->validate();
}
@@ -225,9 +225,9 @@
SkASSERT(!fPurging);
SkASSERT(resource);
SkASSERT(this->isInCache(resource));
- SkASSERT(resource->cacheAccess().getContentKey().isValid());
+ SkASSERT(resource->getContentKey().isValid());
- GrGpuResource* res = fContentHash.find(resource->cacheAccess().getContentKey());
+ GrGpuResource* res = fContentHash.find(resource->getContentKey());
if (NULL != res) {
return false;
}
@@ -281,7 +281,7 @@
// Also purge if the resource has neither a valid scratch key nor a content key.
bool noKey = !resource->cacheAccess().getScratchKey().isValid() &&
- !resource->cacheAccess().getContentKey().isValid();
+ !resource->getContentKey().isValid();
if (overBudget || noKey) {
release = true;
}
@@ -435,18 +435,18 @@
}
if (resource->cacheAccess().isScratch()) {
- SkASSERT(!resource->cacheAccess().getContentKey().isValid());
+ SkASSERT(!resource->getContentKey().isValid());
++scratch;
SkASSERT(fScratchMap.countForKey(resource->cacheAccess().getScratchKey()));
SkASSERT(!resource->cacheAccess().isWrapped());
} else if (resource->cacheAccess().getScratchKey().isValid()) {
SkASSERT(!resource->cacheAccess().isBudgeted() ||
- resource->cacheAccess().getContentKey().isValid());
+ resource->getContentKey().isValid());
++couldBeScratch;
SkASSERT(fScratchMap.countForKey(resource->cacheAccess().getScratchKey()));
SkASSERT(!resource->cacheAccess().isWrapped());
}
- const GrContentKey& contentKey = resource->cacheAccess().getContentKey();
+ const GrContentKey& contentKey = resource->getContentKey();
if (contentKey.isValid()) {
++content;
SkASSERT(fContentHash.find(contentKey) == resource);