AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix up GrGlyphCache ctor

Browse Source 
It looks like the old GrGlyphCache ctor was making an
initial arena alloc of 9 bytes.

Change-Id: Icc0d04c522fc1f90bf06bdfe5bd6ef56315776ac
Reviewed-on: https://skia-review.googlesource.com/c/173232
Reviewed-by: Herb Derby <herb@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Herb Derby <herb@google.com>
This commit is contained in:
Herbert Derby 2018-11-28 14:39:29 -05:00 committed by Skia Commit-Bot
parent c33ec9f8c4
commit 83ea522b4a
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gpu/text/GrGlyphCache.cpp
View File

@ -190,10 +190,7 @@ static bool get_packed_glyph_image(SkGlyphCache* cache, const SkGlyph& glyph, in
*/
GrTextStrike::GrTextStrike(const SkDescriptor& key)
: fFontScalerKey(key)
, fPool(9/*start allocations at 512 bytes*/)
, fAtlasedGlyphs(0)
, fIsAbandoned(false) {}
: fFontScalerKey(key) {}
GrTextStrike::~GrTextStrike() {
SkTDynamicHash<GrGlyph, GrGlyph::PackedID>::Iter iter(&fCache);

4
src/gpu/text/GrGlyphCache.h
View File

@ -89,8 +89,8 @@ private:
SkAutoDescriptor fFontScalerKey;
SkArenaAlloc fPool{512};
int fAtlasedGlyphs;
bool fIsAbandoned;
int fAtlasedGlyphs{0};
bool fIsAbandoned{false};
static const SkGlyph& GrToSkGlyph(SkGlyphCache* cache, GrGlyph::PackedID id) {
return cache->getGlyphIDMetrics(GrGlyph::UnpackID(id),