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/pdf/SkPDFDevice.cpp

diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp
index 7ba2c29..135f533 100644
--- a/src/pdf/SkPDFDevice.cpp
+++ b/src/pdf/SkPDFDevice.cpp
@@ -18,7 +18,6 @@
 #include "SkColorFilter.h"
 #include "SkDraw.h"
 #include "SkFontPriv.h"
-#include "SkGlyphCache.h"
 #include "SkGlyphRun.h"
 #include "SkImageFilterCache.h"
 #include "SkJpegEncoder.h"
@@ -40,6 +39,7 @@
 #include "SkRRect.h"
 #include "SkRasterClip.h"
 #include "SkScopeExit.h"
+#include "SkStrike.h"
 #include "SkString.h"
 #include "SkSurface.h"
 #include "SkTemplates.h"
@@ -989,7 +989,7 @@
 };
 }
 
-static SkRect get_glyph_bounds_device_space(SkGlyphID gid, SkGlyphCache* cache,
+static SkRect get_glyph_bounds_device_space(SkGlyphID gid, SkStrike* cache,
                                             SkScalar xScale, SkScalar yScale,
                                             SkPoint xy, const SkMatrix& ctm) {
     const SkGlyph& glyph = cache->getGlyphIDMetrics(gid);
@@ -1048,7 +1048,7 @@
     }
 }
 
-static bool needs_new_font(SkPDFFont* font, SkGlyphID gid, SkGlyphCache* cache,
+static bool needs_new_font(SkPDFFont* font, SkGlyphID gid, SkStrike* cache,
                            SkAdvancedTypefaceMetrics::FontType fontType) {
     if (!font || !font->hasGlyph(gid)) {
         return true;