remove purge more interface from GrTextBlobCache

Change-Id: Ice1b7593ebf9cf38191c180eb56183ffc6167f0b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/299293
Reviewed-by: Brian Salomon <[email protected]>
Commit-Queue: Herb Derby <[email protected]>

Author: herbderby

src/gpu/GrContextPriv.cpp

@@ -160,10 +160,6 @@ void GrContextPriv::printContextStats() const {
 }
 
 /////////////////////////////////////////////////
-void GrContextPriv::testingOnly_setTextBlobCacheLimit(size_t bytes) {
-    fContext->priv().getTextBlobCache()->setBudget(bytes);
-}
-
 sk_sp<SkImage> GrContextPriv::testingOnly_getFontAtlasImage(GrMaskFormat format, unsigned int index) {
     auto atlasManager = this->getAtlasManager();
     if (!atlasManager) {

src/gpu/GrContextPriv.h

@@ -158,10 +158,6 @@ class GrContextPriv {
     void dumpContextStatsKeyValuePairs(SkTArray<SkString>* keys, SkTArray<double>* values) const;
     void printContextStats() const;
 
-    /** Specify the TextBlob cache limit. If the current cache exceeds this limit it will purge.
-        this is for testing only */
-    void testingOnly_setTextBlobCacheLimit(size_t bytes);
-
     /** Get pointer to atlas texture for given mask format. Note that this wraps an
         actively mutating texture in an SkImage. This could yield unexpected results
         if it gets cached or used more generally. */

src/gpu/GrRecordingContext.cpp

@@ -49,19 +49,7 @@ bool GrRecordingContext::init() {
         return false;
     }
 
-    auto overBudget = [this]() {
-        if (GrContext* direct = this->priv().asDirectContext(); direct != nullptr) {
-
-            // TODO: move text blob draw calls below context
-            // TextBlobs are drawn at the SkGpuDevice level, therefore they cannot rely on
-            // GrRenderTargetContext to perform a necessary flush. The solution is to move drawText
-            // calls to below the GrContext level, but this is not trivial because they call
-            // drawPath on SkGpuDevice.
-            direct->flushAndSubmit();
-        }
-    };
-
-    fTextBlobCache.reset(new GrTextBlobCache(overBudget, this->contextID()));
+    fTextBlobCache.reset(new GrTextBlobCache(this->contextID()));
 
     return true;
 }

src/gpu/text/GrTextBlobCache.cpp

@@ -15,9 +15,8 @@ static inline bool SkShouldPostMessageToBus(
     return msg.fContextID == msgBusUniqueID;
 }
 
-GrTextBlobCache::GrTextBlobCache(PurgeMore purgeMore, uint32_t messageBusID)
-        : fPurgeMore(purgeMore)
-        , fSizeBudget(kDefaultBudget)
+GrTextBlobCache::GrTextBlobCache(uint32_t messageBusID)
+        : fSizeBudget(kDefaultBudget)
         , fMessageBusID(messageBusID)
         , fPurgeBlobInbox(messageBusID) { }
 
@@ -74,12 +73,6 @@ void GrTextBlobCache::freeAll() {
     fCurrentSize = 0;
 }
 
-void GrTextBlobCache::setBudget(size_t budget) {
-    SkAutoMutexExclusive lock{fMutex};
-    fSizeBudget = budget;
-    this->internalCheckPurge();
-}
-
 void GrTextBlobCache::PostPurgeBlobMessage(uint32_t blobID, uint32_t cacheID) {
     SkASSERT(blobID != SK_InvalidGenID);
     SkMessageBus<PurgeBlobMessage>::Post(PurgeBlobMessage(blobID, cacheID));
@@ -117,6 +110,11 @@ size_t GrTextBlobCache::usedBytes() const {
     return fCurrentSize;
 }
 
+bool GrTextBlobCache::isOverBudget() const {
+    SkAutoMutexExclusive lock{fMutex};
+    return fCurrentSize > fSizeBudget;
+}
+
 void GrTextBlobCache::internalCheckPurge(GrTextBlob* blob) {
     // First, purge all stale blob IDs.
     this->internalPurgeStaleBlobs();
@@ -133,13 +131,6 @@ void GrTextBlobCache::internalCheckPurge(GrTextBlob* blob) {
             this->internalRemove(lruBlob);
         }
 
-        // If we break out of the loop with lruBlob == blob, then we haven't purged enough
-        // use the call back and try to free some more.  If we are still overbudget after this,
-        // then this single textblob is over our budget
-        if (blob && lruBlob == blob) {
-            fPurgeMore();
-        }
-
     #ifdef SPEW_BUDGET_MESSAGE
         if (fCurrentSize > fSizeBudget) {
             SkDebugf("Single textblob is larger than our whole budget");

src/gpu/text/GrTextBlobCache.h

@@ -20,10 +20,7 @@
 
 class GrTextBlobCache {
 public:
-     // The callback function used by the cache when it is still over budget after a purge.
-    using PurgeMore = std::function<void()>;
-
-    GrTextBlobCache(PurgeMore purgeMore, uint32_t messageBusID);
+    GrTextBlobCache(uint32_t messageBusID);
 
     sk_sp<GrTextBlob> makeCachedBlob(const SkGlyphRunList& glyphRunList,
                                      const GrTextBlob::Key& key,
@@ -38,8 +35,6 @@ class GrTextBlobCache {
 
     void freeAll() SK_EXCLUDES(fMutex);
 
-    void setBudget(size_t budget) SK_EXCLUDES(fMutex);
-
     struct PurgeBlobMessage {
         PurgeBlobMessage(uint32_t blobID, uint32_t contextUniqueID)
                 : fBlobID(blobID), fContextID(contextUniqueID) {}
@@ -54,7 +49,10 @@ class GrTextBlobCache {
 
     size_t usedBytes() const SK_EXCLUDES(fMutex);
 
+    bool isOverBudget() const SK_EXCLUDES(fMutex);
+
 private:
+    friend class GrTextBlobTestingPeer;
     using TextBlobList = SkTInternalLList<GrTextBlob>;
 
     struct BlobIDCacheEntry {
@@ -89,7 +87,6 @@ class GrTextBlobCache {
     mutable SkMutex fMutex;
     TextBlobList fBlobList SK_GUARDED_BY(fMutex);
     SkTHashMap<uint32_t, BlobIDCacheEntry> fBlobIDCache SK_GUARDED_BY(fMutex);
-    PurgeMore fPurgeMore SK_GUARDED_BY(fMutex);
     size_t fSizeBudget SK_GUARDED_BY(fMutex);
     size_t fCurrentSize SK_GUARDED_BY(fMutex) {0};
 

tests/TextBlobCacheTest.cpp

@@ -29,6 +29,7 @@
 #include "include/gpu/GrContext.h"
 #include "src/gpu/GrContextPriv.h"
 #include "src/gpu/text/GrAtlasManager.h"
+#include "src/gpu/text/GrTextBlobCache.h"
 
 static void draw(SkCanvas* canvas, int redraw, const SkTArray<sk_sp<SkTextBlob>>& blobs) {
     int yOffset = 0;
@@ -50,6 +51,15 @@ static void setup_always_evict_atlas(GrContext* context) {
     context->priv().getAtlasManager()->setAtlasDimensionsToMinimum_ForTesting();
 }
 
+class GrTextBlobTestingPeer {
+public:
+    static void SetBudget(GrTextBlobCache* cache, size_t budget) {
+        SkAutoMutexExclusive lock{cache->fMutex};
+        cache->fSizeBudget = budget;
+        cache->internalCheckPurge();
+    }
+};
+
 // This test hammers the GPU textblobcache and font atlas
 static void text_blob_cache_inner(skiatest::Reporter* reporter, GrContext* context,
                                   int maxTotalText, int maxGlyphID, int maxFamilies, bool normal,
@@ -61,7 +71,7 @@ static void text_blob_cache_inner(skiatest::Reporter* reporter, GrContext* conte
     // configure our context for maximum stressing of cache and atlas
     if (stressTest) {
         setup_always_evict_atlas(context);
-        context->priv().testingOnly_setTextBlobCacheLimit(0);
+        GrTextBlobTestingPeer::SetBudget(context->priv().getTextBlobCache(), 0);
     }
 
     SkImageInfo info = SkImageInfo::Make(kWidth, kHeight, kRGBA_8888_SkColorType,