diff options
| -rw-r--r-- | bench/PathTextBench.cpp | 3 | ||||
| -rw-r--r-- | src/gpu/text/GrAtlasTextContext.cpp | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/bench/PathTextBench.cpp b/bench/PathTextBench.cpp index 4e83d33119..c4429fbafd 100644 --- a/bench/PathTextBench.cpp +++ b/bench/PathTextBench.cpp @@ -46,8 +46,7 @@ private: void onDelayedSetup() override { SkPaint defaultPaint; - SkAutoGlyphCache agc(defaultPaint, nullptr, &SkMatrix::I()); - SkGlyphCache* cache = agc.get(); + auto cache = SkGlyphCache::FindOrCreateStrikeExclusive(defaultPaint); for (int i = 0; i < kNumGlyphs; ++i) { SkGlyphID id = cache->unicharToGlyph(kGlyphs[i]); cache->getScalerContext()->getPath(SkPackedGlyphID(id), &fGlyphs[i]); diff --git a/src/gpu/text/GrAtlasTextContext.cpp b/src/gpu/text/GrAtlasTextContext.cpp index f532f8eea5..0179e433cf 100644 --- a/src/gpu/text/GrAtlasTextContext.cpp +++ b/src/gpu/text/GrAtlasTextContext.cpp @@ -500,8 +500,8 @@ void GrAtlasTextContext::DrawBmpPosTextAsPaths(GrAtlasTextBlob* blob, int runInd SkPaint::GlyphCacheProc glyphCacheProc = SkPaint::GetGlyphCacheProc(pathPaint.getTextEncoding(), pathPaint.isDevKernText(), true); - SkAutoGlyphCache autoCache(pathPaint, &props, nullptr); - SkGlyphCache* cache = autoCache.get(); + auto cache = SkGlyphCache::FindOrCreateStrikeExclusive( + pathPaint, &props, SkScalerContextFlags::kFakeGammaAndBoostContrast, nullptr); const char* stop = text + byteLength; const char* lastText = text; @@ -509,7 +509,7 @@ void GrAtlasTextContext::DrawBmpPosTextAsPaths(GrAtlasTextBlob* blob, int runInd SkTextMapStateProc tmsProc(SkMatrix::I(), offset, scalarsPerPosition); while (text < stop) { - const SkGlyph& glyph = glyphCacheProc(cache, &text); + const SkGlyph& glyph = glyphCacheProc(cache.get(), &text); if (glyph.fWidth) { SkPoint tmsLoc; tmsProc(pos, &tmsLoc); |