commit d464feb1fc744d4fe7427f9894d2aa7b2a331146
author Robert Phillips <robertphillips@google.com> Thu Oct 08 11:00:02 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Oct 08 17:39:12 2020 +0000
tree 4ef0b5f8268d3e663eb0a9f59eb9c1123025620f
parent 2c08814f361e62fd7d422397cc367bde035c1e9a

Rename GrThreadSafeUniquelyKeyedProxyViewCache

Once triangulated paths are added this will no longer just be storing proxy views.

Bug: 1108408
Change-Id: I82fa47b0b85f738d9a25330c29bc2892c9bfeda4
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/323999
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Adlai Holler <adlai@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/GrResourceCache.cpp

diff --git a/src/gpu/GrResourceCache.cpp b/src/gpu/GrResourceCache.cpp
index 5a0910e..f6378db 100644
--- a/src/gpu/GrResourceCache.cpp
+++ b/src/gpu/GrResourceCache.cpp
@@ -21,7 +21,7 @@
 #include "src/gpu/GrProxyProvider.h"
 #include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTextureProxyCacheAccess.h"
-#include "src/gpu/GrThreadSafeUniquelyKeyedProxyViewCache.h"
+#include "src/gpu/GrThreadSafeCache.h"
 #include "src/gpu/GrTracing.h"
 #include "src/gpu/SkGr.h"
 
@@ -201,7 +201,7 @@
 void GrResourceCache::abandonAll() {
     AutoValidate av(this);
 
-    fThreadSafeViewCache->dropAllRefs();
+    fThreadSafeCache->dropAllRefs();
 
     // We need to make sure to free any resources that were waiting on a free message but never
     // received one.
@@ -233,7 +233,7 @@
 void GrResourceCache::releaseAll() {
     AutoValidate av(this);
 
-    fThreadSafeViewCache->dropAllRefs();
+    fThreadSafeCache->dropAllRefs();
 
     this->processFreedGpuResources();
 
@@ -242,7 +242,7 @@
     fTexturesAwaitingUnref.reset();
 
     SkASSERT(fProxyProvider); // better have called setProxyProvider
-    SkASSERT(fThreadSafeViewCache); // better have called setThreadSafeViewCache too
+    SkASSERT(fThreadSafeCache); // better have called setThreadSafeCache too
 
     // We must remove the uniqueKeys from the proxies here. While they possess a uniqueKey
     // they also have a raw pointer back to this class (which is presumably going away)!
@@ -530,7 +530,7 @@
     }
 
     if (stillOverbudget) {
-        fThreadSafeViewCache->dropUniqueRefs(this);
+        fThreadSafeCache->dropUniqueRefs(this);
 
         while (stillOverbudget && fPurgeableQueue.count()) {
             GrGpuResource* resource = fPurgeableQueue.peek();
@@ -546,7 +546,7 @@
 void GrResourceCache::purgeUnlockedResources(bool scratchResourcesOnly) {
 
     if (!scratchResourcesOnly) {
-        fThreadSafeViewCache->dropUniqueRefs(nullptr);
+        fThreadSafeCache->dropUniqueRefs(nullptr);
 
         // We could disable maintaining the heap property here, but it would add a lot of
         // complexity. Moreover, this is rarely called.
@@ -580,7 +580,7 @@
 }
 
 void GrResourceCache::purgeResourcesNotUsedSince(GrStdSteadyClock::time_point purgeTime) {
-    fThreadSafeViewCache->dropUniqueRefsOlderThan(purgeTime);
+    fThreadSafeCache->dropUniqueRefsOlderThan(purgeTime);
 
     while (fPurgeableQueue.count()) {
         const GrStdSteadyClock::time_point resourceTime =