diff options
| author | Victoria Lease <violets@google.com> | 2013-12-17 13:54:29 -0800 |
|---|---|---|
| committer | Victoria Lease <violets@google.com> | 2013-12-17 14:51:43 -0800 |
| commit | 2ee2d59b7d10733e7e11e398d2316035d3b36c73 (patch) | |
| tree | 91f57d3330785cd50624e2deb1b04cc003b23674 /libs/hwui/font/Font.h | |
| parent | 0a11eb10ff08ad7a683cfc7c458b6625b955df2c (diff) | |
| download | frameworks_base-2ee2d59b7d10733e7e11e398d2316035d3b36c73.zip frameworks_base-2ee2d59b7d10733e7e11e398d2316035d3b36c73.tar.gz frameworks_base-2ee2d59b7d10733e7e11e398d2316035d3b36c73.tar.bz2 | |
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
Diffstat (limited to 'libs/hwui/font/Font.h')
| -rw-r--r-- | libs/hwui/font/Font.h | 5 |
1 files changed, 3 insertions, 2 deletions
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 <utils/KeyedVector.h> +#include <SkGlyphCache.h> #include <SkScalerContext.h> #include <SkPaint.h> #include <SkPathMeasure.h> @@ -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, |