Roll Skia from cf8c53436c77 to b43313646796 (1 revision) am: 58ebf05ec5 am: 614cb53c20

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skia/+/11933884

Change-Id: I17c97f9d054e2d1eda6272063a6fbabd82982cf7

1 files changed, 4 insertions, 6 deletions

diff --git a/src/core/SkStrikeCache.cpp b/src/core/SkStrikeCache.cpp
index c7830814a2..b5bc181a7a 100644
--- a/src/core/SkStrikeCache.cpp
+++ b/src/core/SkStrikeCache.cpp
@@ -101,6 +101,7 @@ auto SkStrikeCache::findOrCreateStrike(const SkDescriptor& desc,
         auto scaler = typeface.createScalerContext(effects, &desc);
         strike = this->internalCreateStrike(desc, std::move(scaler));
     }
+    this->internalPurge();
     return strike;
 }
 
@@ -181,7 +182,9 @@ void SkStrikeCache::DumpMemoryStatistics(SkTraceMemoryDump* dump) {
 
 SkExclusiveStrikePtr SkStrikeCache::findStrikeExclusive(const SkDescriptor& desc) {
     SkAutoSpinlock ac(fLock);
-    return SkExclusiveStrikePtr(this->internalFindStrikeOrNull(desc));
+    sk_sp<SkStrike> result = this->internalFindStrikeOrNull(desc);
+    this->internalPurge();
+    return SkExclusiveStrikePtr(result);
 }
 
 auto SkStrikeCache::internalFindStrikeOrNull(const SkDescriptor& desc) -> sk_sp<Strike> {
@@ -251,11 +254,6 @@ int SkStrikeCache::getCacheCountLimit() const {
 }
 
 size_t SkStrikeCache::setCacheSizeLimit(size_t newLimit) {
-    static const size_t minLimit = 256 * 1024;
-    if (newLimit < minLimit) {
-        newLimit = minLimit;
-    }
-
     SkAutoSpinlock ac(fLock);
 
     size_t prevLimit = fCacheSizeLimit;