commit 87b5d7f42b657d8e05d5f7aaa60f1594f23c153d
author android-build-team Robot <android-build-team-robot@google.com> Tue Jun 23 01:10:20 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Jun 23 01:10:20 2020 +0000
tree c44c80a873bd6cdce2fdab284828d56bfe04fb7d
parent be30b86fd4561389c36a0271abbf13c4e64cc06b
parent 58ebf05ec50f8fcc87d4e5d0fbfb898a73510a72

Snap for 6617762 from 58ebf05ec50f8fcc87d4e5d0fbfb898a73510a72 to rvc-release

Change-Id: I4e207d4d050dc92d1d356de762040a28484cf13c

src/core/SkStrikeCache.cpp

diff --git a/src/core/SkStrikeCache.cpp b/src/core/SkStrikeCache.cpp
index c783081..b5bc181 100644
--- a/src/core/SkStrikeCache.cpp
+++ b/src/core/SkStrikeCache.cpp
@@ -101,6 +101,7 @@
         auto scaler = typeface.createScalerContext(effects, &desc);
         strike = this->internalCreateStrike(desc, std::move(scaler));
     }
+    this->internalPurge();
     return strike;
 }
 
@@ -181,7 +182,9 @@
 
 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 @@
 }
 
 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;