From 61d56b92a4076f8afd644d015913641d691e39c8 Mon Sep 17 00:00:00 2001 From: Herb Derby Date: Mon, 5 Mar 2018 14:23:47 -0500 Subject: Remove attach and detach glyph cache. BUG=skia:7515 Change-Id: Ib978e3cf4cfffdefe6453feb520e5e73684abf2e Reviewed-on: https://skia-review.googlesource.com/112560 Reviewed-by: Ben Wagner Commit-Queue: Herb Derby --- bench/PathTextBench.cpp | 2 +- bench/SkGlyphCacheBench.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'bench') diff --git a/bench/PathTextBench.cpp b/bench/PathTextBench.cpp index 8920223c35..4e83d33119 100644 --- a/bench/PathTextBench.cpp +++ b/bench/PathTextBench.cpp @@ -47,7 +47,7 @@ private: void onDelayedSetup() override { SkPaint defaultPaint; SkAutoGlyphCache agc(defaultPaint, nullptr, &SkMatrix::I()); - SkGlyphCache* cache = agc.getCache(); + SkGlyphCache* cache = agc.get(); for (int i = 0; i < kNumGlyphs; ++i) { SkGlyphID id = cache->unicharToGlyph(kGlyphs[i]); cache->getScalerContext()->getPath(SkPackedGlyphID(id), &fGlyphs[i]); diff --git a/bench/SkGlyphCacheBench.cpp b/bench/SkGlyphCacheBench.cpp index 1cc257fd3f..c760eb5583 100644 --- a/bench/SkGlyphCacheBench.cpp +++ b/bench/SkGlyphCacheBench.cpp @@ -21,7 +21,7 @@ static void do_font_stuff(SkPaint* paint) { for (SkScalar i = 8; i < 64; i++) { paint->setTextSize(i); SkAutoGlyphCacheNoGamma autoCache(*paint, nullptr, nullptr); - SkGlyphCache* cache = autoCache.getCache(); + SkGlyphCache* cache = autoCache.get(); uint16_t glyphs['z']; for (int c = ' '; c < 'z'; c++) { glyphs[c] = cache->unicharToGlyph(c); -- cgit v1.2.3