From 2ee2d59b7d10733e7e11e398d2316035d3b36c73 Mon Sep 17 00:00:00 2001 From: Victoria Lease Date: Tue, 17 Dec 2013 13:54:29 -0800 Subject: pass SkGlyphCache into updateGlyphCache() Doing so prevents us from double-locking the glyph cache, thereby effectively locking ourselves out of reusing work that we'd just done. Bug: 11968757 Change-Id: I5c552f2d0bbe30af2ce9054ba684e7da756a0d89 --- libs/hwui/font/Font.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libs/hwui/font/Font.h') diff --git a/libs/hwui/font/Font.h b/libs/hwui/font/Font.h index 9e7ec2d..f68b430 100644 --- a/libs/hwui/font/Font.h +++ b/libs/hwui/font/Font.h @@ -19,6 +19,7 @@ #include +#include #include #include #include @@ -117,8 +118,8 @@ private: void invalidateTextureCache(CacheTexture* cacheTexture = NULL); CachedGlyphInfo* cacheGlyph(SkPaint* paint, glyph_t glyph, bool precaching); - void updateGlyphCache(SkPaint* paint, const SkGlyph& skiaGlyph, CachedGlyphInfo* glyph, - bool precaching); + void updateGlyphCache(SkPaint* paint, const SkGlyph& skiaGlyph, SkGlyphCache* skiaGlyphCache, + CachedGlyphInfo* glyph, bool precaching); void measureCachedGlyph(CachedGlyphInfo* glyph, int x, int y, uint8_t *bitmap, uint32_t bitmapW, uint32_t bitmapH, -- cgit v1.1