diff options
| -rw-r--r-- | bench/SkGlyphCacheBench.cpp | 4 | ||||
| -rw-r--r-- | src/core/SkGlyphCache.h | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/bench/SkGlyphCacheBench.cpp b/bench/SkGlyphCacheBench.cpp index c760eb5583..0cd3ab433f 100644 --- a/bench/SkGlyphCacheBench.cpp +++ b/bench/SkGlyphCacheBench.cpp @@ -20,8 +20,8 @@ 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.get(); + auto cache = SkGlyphCache::FindOrCreateStrikeExclusive( + *paint, nullptr, SkScalerContextFlags::kNone, nullptr); uint16_t glyphs['z']; for (int c = ' '; c < 'z'; c++) { glyphs[c] = cache->unicharToGlyph(c); diff --git a/src/core/SkGlyphCache.h b/src/core/SkGlyphCache.h index 3db63fe63c..097d41ac42 100644 --- a/src/core/SkGlyphCache.h +++ b/src/core/SkGlyphCache.h @@ -282,6 +282,7 @@ private: using INHERITED = SkExclusiveStrikePtr; }; +#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK class SkAutoGlyphCacheNoGamma : public SkExclusiveStrikePtr { public: SkAutoGlyphCacheNoGamma(const SkPaint& paint, @@ -293,7 +294,9 @@ public: private: using INHERITED = SkExclusiveStrikePtr; }; -#define SkAutoGlyphCache(...) SK_REQUIRE_LOCAL_VAR(SkAutoGlyphCache) #define SkAutoGlyphCacheNoGamma(...) SK_REQUIRE_LOCAL_VAR(SkAutoGlyphCacheNoGamma) +#endif + +#define SkAutoGlyphCache(...) SK_REQUIRE_LOCAL_VAR(SkAutoGlyphCache) #endif |