commit 9428a37255586da6d34b86c6ed0d56729dbfd731
author Herb Derby <herb@google.com> Mon Apr 10 11:25:30 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Apr 13 18:33:02 2017 +0000
tree 5c047b77435319345d4151d9d67417f17d67db8e
parent 6ad59789e7153c0c427d5409e8eb8ec61494931a

Move GrAtlasGlyphCache over to SkArenaAlloc from SkVarAlloc.

Change-Id: Ibeee7235d30c68be9fd4f68ecf30a65c7ecb78f5
Reviewed-on: https://skia-review.googlesource.com/13020
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Herb Derby <herb@google.com>

src/gpu/text/GrAtlasGlyphCache.cpp

diff --git a/src/gpu/text/GrAtlasGlyphCache.cpp b/src/gpu/text/GrAtlasGlyphCache.cpp
index 213ecfc..0b364f4 100644
--- a/src/gpu/text/GrAtlasGlyphCache.cpp
+++ b/src/gpu/text/GrAtlasGlyphCache.cpp
@@ -413,7 +413,7 @@
     }
     GrMaskFormat format = get_packed_glyph_mask_format(skGlyph);
 
-    GrGlyph* glyph = (GrGlyph*)fPool.alloc(sizeof(GrGlyph));
+    GrGlyph* glyph = fPool.make<GrGlyph>();
     glyph->init(packed, bounds, format);
     fCache.add(glyph);
     return glyph;

src/gpu/text/GrAtlasGlyphCache.h

diff --git a/src/gpu/text/GrAtlasGlyphCache.h b/src/gpu/text/GrAtlasGlyphCache.h
index 9e97966..a75600b 100644
--- a/src/gpu/text/GrAtlasGlyphCache.h
+++ b/src/gpu/text/GrAtlasGlyphCache.h
@@ -11,9 +11,9 @@
 #include "GrCaps.h"
 #include "GrDrawOpAtlas.h"
 #include "GrGlyph.h"
+#include "SkArenaAlloc.h"
 #include "SkGlyphCache.h"
 #include "SkTDynamicHash.h"
-#include "SkVarAlloc.h"
 
 class GrAtlasGlyphCache;
 class GrGpu;
@@ -85,7 +85,7 @@
 private:
     SkTDynamicHash<GrGlyph, GrGlyph::PackedID> fCache;
     SkAutoDescriptor fFontScalerKey;
-    SkVarAlloc fPool;
+    SkArenaAlloc fPool{512};
 
     GrAtlasGlyphCache* fAtlasGlyphCache;
     int fAtlasedGlyphs;