commit 5fd955e36d6423e337bfd3d782a1c707949a9594
author Herb Derby <herb@google.com> Wed Jan 16 11:23:29 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jan 16 18:28:28 2019 +0000
tree 797f26b4d87bc2829544488979155b8d3fca5140
parent c39d0c850fa7572d4a0906a8e6f99cc5186984b0

Rename SkGlyphCache -> SkStrike

Change-Id: I51ca9f61feb0d4f7352ed634b7070327f31ccf05
Reviewed-on: https://skia-review.googlesource.com/c/184400
Reviewed-by: Ben Wagner <bungeman@google.com>
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Herb Derby <herb@google.com>

src/gpu/text/GrGlyphCache.h

diff --git a/src/gpu/text/GrGlyphCache.h b/src/gpu/text/GrGlyphCache.h
index 585570c..92d8910 100644
--- a/src/gpu/text/GrGlyphCache.h
+++ b/src/gpu/text/GrGlyphCache.h
@@ -11,8 +11,8 @@
 #include "GrDrawOpAtlas.h"
 #include "GrGlyph.h"
 #include "SkArenaAlloc.h"
-#include "SkGlyphCache.h"
 #include "SkMasks.h"
+#include "SkStrike.h"
 #include "SkTDynamicHash.h"
 
 class GrGlyphCache;
@@ -43,7 +43,7 @@
     // draw a clear square.
     // skbug:4143 crbug:510931
     GrGlyph* getGlyph(SkPackedGlyphID packed,
-                      SkGlyphCache* cache) {
+                      SkStrike* cache) {
         GrGlyph* glyph = fCache.find(packed);
         if (!glyph) {
             // We could return this to the caller, but in practice it adds code complexity for
@@ -62,7 +62,7 @@
     // get the actual glyph image itself when we get the glyph metrics.
     GrDrawOpAtlas::ErrorCode addGlyphToAtlas(GrResourceProvider*, GrDeferredUploadTarget*,
                                              GrGlyphCache*, GrAtlasManager*, GrGlyph*,
-                                             SkGlyphCache*, GrMaskFormat expectedMaskFormat,
+                                             SkStrike*, GrMaskFormat expectedMaskFormat,
                                              bool isScaledGlyph);
 
     // testing
@@ -88,7 +88,7 @@
     int fAtlasedGlyphs{0};
     bool fIsAbandoned{false};
 
-    static const SkGlyph& GrToSkGlyph(SkGlyphCache* cache, SkPackedGlyphID id) {
+    static const SkGlyph& GrToSkGlyph(SkStrike* cache, SkPackedGlyphID id) {
         return cache->getGlyphIDMetrics(id.code(), id.getSubXFixed(), id.getSubYFixed());
     }
 
@@ -112,7 +112,7 @@
     // another client of the cache may cause the strike to be purged while it is still reffed.
     // Therefore, the caller must check GrTextStrike::isAbandoned() if there are other
     // interactions with the cache since the strike was received.
-    sk_sp<GrTextStrike> getStrike(const SkGlyphCache* cache) {
+    sk_sp<GrTextStrike> getStrike(const SkStrike* cache) {
         sk_sp<GrTextStrike> strike = sk_ref_sp(fCache.find(cache->getDescriptor()));
         if (!strike) {
             strike = this->generateStrike(cache);
@@ -127,7 +127,7 @@
     static void HandleEviction(GrDrawOpAtlas::AtlasID, void*);
 
 private:
-    sk_sp<GrTextStrike> generateStrike(const SkGlyphCache* cache) {
+    sk_sp<GrTextStrike> generateStrike(const SkStrike* cache) {
         // 'fCache' get the construction ref
         sk_sp<GrTextStrike> strike = sk_ref_sp(new GrTextStrike(cache->getDescriptor()));
         fCache.add(strike.get());