commit 947556f6583e62b1ae19dcda94e0dea78babda2b
author joshualitt <joshualitt@chromium.org> Fri Nov 21 09:03:45 2014 -0800
committer Commit bot <commit-bot@chromium.org> Fri Nov 21 09:03:45 2014 -0800
tree ab160c43ac1568bc4656c95cc49a6e9d42e45265
parent 42ddcd49060f64be57f00e651650154f9b4f3a08

remove GrAllocPool

BUG=skia:

Review URL: https://codereview.chromium.org/742253002

src/gpu/GrTextStrike.cpp

diff --git a/src/gpu/GrTextStrike.cpp b/src/gpu/GrTextStrike.cpp
index 0186af1..aa5cd94 100644
--- a/src/gpu/GrTextStrike.cpp
+++ b/src/gpu/GrTextStrike.cpp
@@ -227,7 +227,7 @@
     atlas and a position within that texture.
  */
 
-GrTextStrike::GrTextStrike(GrFontCache* cache, const GrFontDescKey* key) : fPool(64) {
+GrTextStrike::GrTextStrike(GrFontCache* cache, const GrFontDescKey* key) {
     fFontScalerKey = key;
     fFontScalerKey->ref();
 
@@ -267,7 +267,7 @@
     }
     GrMaskFormat format = scaler->getPackedGlyphMaskFormat(packed);
     
-    GrGlyph* glyph = fPool.alloc();
+    GrGlyph* glyph = (GrGlyph*)fPool.alloc(sizeof(GrGlyph), SK_MALLOC_THROW);
     glyph->init(packed, bounds, format);
     fCache.add(glyph);
     return glyph;