minimize includes and forwards for remote glyph cache
Change-Id: I83472d8eeb248be20db68d8f05cab9b98b8d77cc
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/320558
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Herb Derby <herb@google.com>
diff --git a/bench/SkGlyphCacheBench.cpp b/bench/SkGlyphCacheBench.cpp
index e1c29f3..695c40c 100644
--- a/bench/SkGlyphCacheBench.cpp
+++ b/bench/SkGlyphCacheBench.cpp
@@ -12,8 +12,8 @@
#include "include/core/SkGraphics.h"
#include "include/core/SkTypeface.h"
#include "src/core/SkRemoteGlyphCache.h"
-#include "src/core/SkStrikeCache.h"
#include "src/core/SkStrikeSpec.h"
+#include "src/core/SkTLazy.h"
#include "src/core/SkTaskGroup.h"
#include "src/core/SkTextBlobTrace.h"
#include "tools/Resources.h"
diff --git a/src/core/SkRemoteGlyphCache.cpp b/src/core/SkRemoteGlyphCache.cpp
index a685b18..6f69bea 100644
--- a/src/core/SkRemoteGlyphCache.cpp
+++ b/src/core/SkRemoteGlyphCache.cpp
@@ -14,7 +14,10 @@
#include <string>
#include <tuple>
+#include "include/core/SkSerialProcs.h"
+#include "include/core/SkTypeface.h"
#include "include/private/SkChecksum.h"
+#include "include/private/SkTHash.h"
#include "src/core/SkDevice.h"
#include "src/core/SkDraw.h"
#include "src/core/SkEnumerate.h"
@@ -22,10 +25,10 @@
#include "src/core/SkScalerCache.h"
#include "src/core/SkSpan.h"
#include "src/core/SkStrikeCache.h"
+#include "src/core/SkStrikeForGPU.h"
#include "src/core/SkTLazy.h"
#include "src/core/SkTraceEvent.h"
#include "src/core/SkTypeface_remote.h"
-#include "src/core/SkZip.h"
#if SK_SUPPORT_GPU
#include "include/gpu/GrContextOptions.h"
diff --git a/src/core/SkRemoteGlyphCache.h b/src/core/SkRemoteGlyphCache.h
index 6efbf68..15840c3 100644
--- a/src/core/SkRemoteGlyphCache.h
+++ b/src/core/SkRemoteGlyphCache.h
@@ -12,33 +12,21 @@
//#define SK_CAPTURE_DRAW_TEXT_BLOB
#include <memory>
-#include <tuple>
-#include <unordered_map>
-#include <unordered_set>
#include <vector>
#include "include/core/SkData.h"
#include "include/core/SkRefCnt.h"
-#include "include/core/SkSerialProcs.h"
-#include "include/core/SkTypeface.h"
-#include "include/private/SkTHash.h"
#include "include/utils/SkNoDrawCanvas.h"
-#include "src/core/SkDevice.h"
-#include "src/core/SkStrikeForGPU.h"
-#include "src/core/SkTLazy.h"
class Deserializer;
class Serializer;
-enum SkAxisAlignment : uint32_t;
-class SkDescriptor;
class SkAutoDescriptor;
struct SkPackedGlyphID;
-enum SkScalerContextFlags : uint32_t;
class SkStrikeCache;
-class SkTypefaceProxy;
-struct WireTypeface;
-
+class SkStrikeClientImpl;
class SkStrikeServer;
+class SkStrikeServerImpl;
+class SkTypeface;
// A SkTextBlobCacheDiffCanvas is used to populate the SkStrikeServer with ops
// which will be serialized and rendered using the SkStrikeClient.
@@ -66,10 +54,7 @@
};
using SkDiscardableHandleId = uint32_t;
-
-
// This class is not thread-safe.
-class SkStrikeServerImpl;
class SkStrikeServer {
public:
// An interface used by the server to create handles for pinning SkStrike
@@ -118,7 +103,6 @@
std::unique_ptr<SkStrikeServerImpl> fImpl;
};
-class SkStrikeClientImpl;
class SkStrikeClient {
public:
// This enum is used in histogram reporting in chromium. Please don't re-order the list of