Index: src/gpu/text/GrAtlasTextBlob.cpp |
diff --git a/src/gpu/text/GrAtlasTextBlob.cpp b/src/gpu/text/GrAtlasTextBlob.cpp |
index 03260a6e522233236527c93085a530d4603cf00c..54af7af87a2d32944fb39f73466b5c6e2486bd67 100644 |
--- a/src/gpu/text/GrAtlasTextBlob.cpp |
+++ b/src/gpu/text/GrAtlasTextBlob.cpp |
@@ -48,7 +48,6 @@ GrAtlasTextBlob* GrAtlasTextBlob::Create(GrMemoryPool* pool, int glyphCount, int |
return cacheBlob; |
} |
- |
SkGlyphCache* GrAtlasTextBlob::setupCache(int runIndex, |
const SkSurfaceProps& props, |
uint32_t scalerContextFlags, |
@@ -69,12 +68,12 @@ void GrAtlasTextBlob::appendGlyph(int runIndex, |
GrColor color, |
GrBatchTextStrike* strike, |
GrGlyph* glyph, |
- GrFontScaler* scaler, const SkGlyph& skGlyph, |
+ SkGlyphCache* cache, const SkGlyph& skGlyph, |
SkScalar x, SkScalar y, SkScalar scale, bool applyVM) { |
// If the glyph is too large we fall back to paths |
if (glyph->fTooLargeForAtlas) { |
- this->appendLargeGlyph(glyph, scaler, skGlyph, x, y, scale, applyVM); |
+ this->appendLargeGlyph(glyph, cache, skGlyph, x, y, scale, applyVM); |
return; |
} |
@@ -152,10 +151,10 @@ void GrAtlasTextBlob::appendGlyph(int runIndex, |
subRun->glyphAppended(); |
} |
-void GrAtlasTextBlob::appendLargeGlyph(GrGlyph* glyph, GrFontScaler* scaler, const SkGlyph& skGlyph, |
+void GrAtlasTextBlob::appendLargeGlyph(GrGlyph* glyph, SkGlyphCache* cache, const SkGlyph& skGlyph, |
SkScalar x, SkScalar y, SkScalar scale, bool applyVM) { |
if (nullptr == glyph->fPath) { |
- const SkPath* glyphPath = scaler->getGlyphPath(skGlyph); |
+ const SkPath* glyphPath = cache->findPath(skGlyph); |
if (!glyphPath) { |
return; |
} |