fonts: Reland push font remoting.

This relands the following changes:
1) https://skia-review.googlesource.com/c/skia/+/120283
2) https://skia-review.googlesource.com/c/skia/+/125029
3) https://skia-review.googlesource.com/c/skia/+/125140

The original changes had to be reverted due to a memory leak in
SkBaseDevice from SkTextBlobCacheDiffCanvas. This has been addressed by
https://skia-review.googlesource.com/c/skia/+/125160

TBR=herb@google.com

Bug: skia:7515, 831354
Change-Id: I73f4fcb1c397f31bf01553ff48c71ed2d6dd0770
Reviewed-on: https://skia-review.googlesource.com/125326
Commit-Queue: Khusal Sagar <khushalsagar@chromium.org>
Reviewed-by: Khusal Sagar <khushalsagar@chromium.org>

1 files changed, 1 insertions, 18 deletions

diff --git a/src/core/SkStrikeCache.h b/src/core/SkStrikeCache.h
index 3e199da1e9..df048e33be 100644
--- a/src/core/SkStrikeCache.h
+++ b/src/core/SkStrikeCache.h
@@ -9,6 +9,7 @@
 #define SkStrikeCache_DEFINED
 
 #include <unordered_map>
+#include <unordered_set>
 
 #include "SkDescriptor.h"
 #include "SkSpinlock.h"
@@ -31,24 +32,6 @@ class SkTraceMemoryDump;
 
 ///////////////////////////////////////////////////////////////////////////////
 
-struct SkDescriptorMapOperators {
-    size_t operator()(const SkDescriptor* key) const {
-        return key->getChecksum();
-    }
-
-    bool operator()(const SkDescriptor* lhs, const SkDescriptor* rhs) const {
-        return *lhs == *rhs;
-    }
-};
-
-template <typename T>
-using SkDescriptorMap =
-        std::unordered_map<
-                const SkDescriptor*,
-                T,
-                SkDescriptorMapOperators,
-                SkDescriptorMapOperators>;
-
 class SkStrikePinner {
 public:
     virtual ~SkStrikePinner() = default;