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/GrBlurUtils.cpp

diff --git a/src/gpu/GrBlurUtils.cpp b/src/gpu/GrBlurUtils.cpp
index f31791a..3343363 100644
--- a/src/gpu/GrBlurUtils.cpp
+++ b/src/gpu/GrBlurUtils.cpp
@@ -20,7 +20,7 @@
 #include "src/gpu/GrSoftwarePathRenderer.h"
 #include "src/gpu/GrStyle.h"
 #include "src/gpu/GrTextureProxy.h"
-#include "src/gpu/GrThreadSafeUniquelyKeyedProxyViewCache.h"
+#include "src/gpu/GrThreadSafeCache.h"
 #include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/geometry/GrStyledShape.h"
 
@@ -126,13 +126,13 @@
     SkASSERT(filter);
     SkASSERT(!shape.style().applies());
 
-    auto threadSafeViewCache = rContext->priv().threadSafeViewCache();
+    auto threadSafeCache = rContext->priv().threadSafeCache();
 
     GrSurfaceProxyView filteredMaskView;
     sk_sp<SkData> data;
 
     if (key->isValid()) {
-        std::tie(filteredMaskView, data) = threadSafeViewCache->findWithData(*key);
+        std::tie(filteredMaskView, data) = threadSafeCache->findWithData(*key);
     }
 
     if (filteredMaskView) {
@@ -196,8 +196,7 @@
 
         if (key->isValid()) {
             key->setCustomData(create_data(*drawRect, unclippedDevShapeBounds));
-            std::tie(filteredMaskView, data) = threadSafeViewCache->addWithData(*key,
-                                                                                filteredMaskView);
+            std::tie(filteredMaskView, data) = threadSafeCache->addWithData(*key, filteredMaskView);
             // If we got a different view back from 'addWithData' it could have a different drawRect
             *drawRect = extract_draw_rect_from_data(data.get(), unclippedDevShapeBounds);
         }
@@ -400,15 +399,15 @@
         return {};
     }
 
-    auto threadSafeViewCache = dContext->priv().threadSafeViewCache();
+    auto threadSafeCache = dContext->priv().threadSafeCache();
 
     GrSurfaceProxyView lazyView;
-    sk_sp<GrThreadSafeUniquelyKeyedProxyViewCache::Trampoline> trampoline;
+    sk_sp<GrThreadSafeCache::Trampoline> trampoline;
 
     if (key->isValid()) {
         // In this case, we want GPU-filtered masks to have priority over SW-generated ones so
         // we pre-emptively add a lazy-view to the cache and fill it in later.
-        std::tie(lazyView, trampoline) = GrThreadSafeUniquelyKeyedProxyViewCache::CreateLazyView(
+        std::tie(lazyView, trampoline) = GrThreadSafeCache::CreateLazyView(
                 dContext, GrColorType::kAlpha_8, maskRect->size(),
                 kMaskOrigin, SkBackingFit::kApprox);
         if (!lazyView) {
@@ -416,7 +415,7 @@
         }
 
         key->setCustomData(create_data(*maskRect, unclippedDevShapeBounds));
-        auto [cachedView, data] = threadSafeViewCache->findOrAddWithData(*key, lazyView);
+        auto [cachedView, data] = threadSafeCache->findOrAddWithData(*key, lazyView);
         if (cachedView != lazyView) {
             // In this case, the gpu-thread lost out to a recording thread - use its result.
             SkASSERT(data);
@@ -440,7 +439,7 @@
             // succeeded but, if it does, remove the lazy-view from the cache and fallback to
             // a SW-created mask. Note that any recording threads that glommed onto the
             // lazy-view will have to, later, drop those draws.
-            threadSafeViewCache->remove(*key);
+            threadSafeCache->remove(*key);
         }
         return {};
     }
@@ -456,7 +455,7 @@
             // Remove the lazy-view from the cache and fallback to a SW-created mask. Note that
             // any recording threads that glommed onto the lazy-view will have to, later, drop
             // those draws.
-            threadSafeViewCache->remove(*key);
+            threadSafeCache->remove(*key);
         }
         return {};
     }