commit 74ad27d9ef3e77bc555506477e4fa5910d1f0fec
author Robert Phillips <robertphillips@google.com> Tue Oct 20 10:16:55 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Oct 20 17:11:41 2020 +0000
tree dd34911f424576c00f7fcc86591642738cca3c0f
parent 130eef1c248274872c8de8ae34de0edee0695d15

Rename some of GrThreadSafeCache's member variables

Cached vertex blobs are coming so the old 'view'-based names weren't helpful.

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

src/gpu/GrThreadSafeCache.cpp

diff --git a/src/gpu/GrThreadSafeCache.cpp b/src/gpu/GrThreadSafeCache.cpp
index 9e8a5cc..e63a5cd 100644
--- a/src/gpu/GrThreadSafeCache.cpp
+++ b/src/gpu/GrThreadSafeCache.cpp
@@ -25,22 +25,22 @@
 int GrThreadSafeCache::numEntries() const {
     SkAutoSpinlock lock{fSpinLock};
 
-    return fUniquelyKeyedProxyViewMap.count();
+    return fUniquelyKeyedEntryMap.count();
 }
 
 size_t GrThreadSafeCache::approxBytesUsedForHash() const {
     SkAutoSpinlock lock{fSpinLock};
 
-    return fUniquelyKeyedProxyViewMap.approxBytesUsed();
+    return fUniquelyKeyedEntryMap.approxBytesUsed();
 }
 #endif
 
 void GrThreadSafeCache::dropAllRefs() {
     SkAutoSpinlock lock{fSpinLock};
 
-    fUniquelyKeyedProxyViewMap.reset();
-    while (auto tmp = fUniquelyKeyedProxyViewList.head()) {
-        fUniquelyKeyedProxyViewList.remove(tmp);
+    fUniquelyKeyedEntryMap.reset();
+    while (auto tmp = fUniquelyKeyedEntryList.head()) {
+        fUniquelyKeyedEntryList.remove(tmp);
         this->recycleEntry(tmp);
     }
     // TODO: should we empty out the fFreeEntryList and reset fEntryAllocator?
@@ -52,7 +52,7 @@
     SkAutoSpinlock lock{fSpinLock};
 
     // Iterate from LRU to MRU
-    Entry* cur = fUniquelyKeyedProxyViewList.tail();
+    Entry* cur = fUniquelyKeyedEntryList.tail();
     Entry* prev = cur ? cur->fPrev : nullptr;
 
     while (cur) {
@@ -61,8 +61,8 @@
         }
 
         if (cur->fView.proxy()->unique()) {
-            fUniquelyKeyedProxyViewMap.remove(cur->fKey);
-            fUniquelyKeyedProxyViewList.remove(cur);
+            fUniquelyKeyedEntryMap.remove(cur->fKey);
+            fUniquelyKeyedEntryList.remove(cur);
             this->recycleEntry(cur);
         }
 
@@ -75,7 +75,7 @@
     SkAutoSpinlock lock{fSpinLock};
 
     // Iterate from LRU to MRU
-    Entry* cur = fUniquelyKeyedProxyViewList.tail();
+    Entry* cur = fUniquelyKeyedEntryList.tail();
     Entry* prev = cur ? cur->fPrev : nullptr;
 
     while (cur) {
@@ -85,8 +85,8 @@
         }
 
         if (cur->fView.proxy()->unique()) {
-            fUniquelyKeyedProxyViewMap.remove(cur->fKey);
-            fUniquelyKeyedProxyViewList.remove(cur);
+            fUniquelyKeyedEntryMap.remove(cur->fKey);
+            fUniquelyKeyedEntryList.remove(cur);
             this->recycleEntry(cur);
         }
 
@@ -97,13 +97,13 @@
 
 std::tuple<GrSurfaceProxyView, sk_sp<SkData>> GrThreadSafeCache::internalFind(
                                                        const GrUniqueKey& key) {
-    Entry* tmp = fUniquelyKeyedProxyViewMap.find(key);
+    Entry* tmp = fUniquelyKeyedEntryMap.find(key);
     if (tmp) {
-        SkASSERT(fUniquelyKeyedProxyViewList.isInList(tmp));
+        SkASSERT(fUniquelyKeyedEntryList.isInList(tmp));
         // make the sought out entry the MRU
         tmp->fLastAccess = GrStdSteadyClock::now();
-        fUniquelyKeyedProxyViewList.remove(tmp);
-        fUniquelyKeyedProxyViewList.addToHead(tmp);
+        fUniquelyKeyedEntryList.remove(tmp);
+        fUniquelyKeyedEntryList.addToHead(tmp);
         return { tmp->fView, tmp->fKey.refCustomData() };
     }
 
@@ -142,8 +142,8 @@
 
     // make 'entry' the MRU
     entry->fLastAccess = GrStdSteadyClock::now();
-    fUniquelyKeyedProxyViewList.addToHead(entry);
-    fUniquelyKeyedProxyViewMap.add(entry);
+    fUniquelyKeyedEntryList.addToHead(entry);
+    fUniquelyKeyedEntryMap.add(entry);
     return entry;
 }
 
@@ -160,11 +160,11 @@
 std::tuple<GrSurfaceProxyView, sk_sp<SkData>> GrThreadSafeCache::internalAdd(
                                                                 const GrUniqueKey& key,
                                                                 const GrSurfaceProxyView& view) {
-    Entry* tmp = fUniquelyKeyedProxyViewMap.find(key);
+    Entry* tmp = fUniquelyKeyedEntryMap.find(key);
     if (!tmp) {
         tmp = this->getEntry(key, view);
 
-        SkASSERT(fUniquelyKeyedProxyViewMap.find(key));
+        SkASSERT(fUniquelyKeyedEntryMap.find(key));
     }
 
     return { tmp->fView, tmp->fKey.refCustomData() };
@@ -216,10 +216,10 @@
 void GrThreadSafeCache::remove(const GrUniqueKey& key) {
     SkAutoSpinlock lock{fSpinLock};
 
-    Entry* tmp = fUniquelyKeyedProxyViewMap.find(key);
+    Entry* tmp = fUniquelyKeyedEntryMap.find(key);
     if (tmp) {
-        fUniquelyKeyedProxyViewMap.remove(key);
-        fUniquelyKeyedProxyViewList.remove(tmp);
+        fUniquelyKeyedEntryMap.remove(key);
+        fUniquelyKeyedEntryList.remove(tmp);
         this->recycleEntry(tmp);
     }
 }