Chromium Code Reviews| Index: src/gpu/GrTextStrike.h |
| diff --git a/src/gpu/GrTextStrike.h b/src/gpu/GrTextStrike.h |
| index 779d676e433f2a50e3185898396db9c221c05ee6..09d7323179543950840c1f937e342fcc4dc9c2f0 100644 |
| --- a/src/gpu/GrTextStrike.h |
| +++ b/src/gpu/GrTextStrike.h |
| @@ -11,12 +11,12 @@ |
| #ifndef GrTextStrike_DEFINED |
| #define GrTextStrike_DEFINED |
| -#include "GrAllocPool.h" |
| +#include "GrAtlas.h" |
| +#include "GrDrawTarget.h" |
| #include "GrFontScaler.h" |
| -#include "SkTDynamicHash.h" |
| #include "GrGlyph.h" |
| -#include "GrDrawTarget.h" |
| -#include "GrAtlas.h" |
| +#include "SkTDynamicHash.h" |
| +#include "SkVarAlloc.h" |
| class GrFontCache; |
| class GrGpu; |
| @@ -62,7 +62,7 @@ public: |
| private: |
| SkTDynamicHash<GrGlyph, GrGlyph::PackedID> fCache; |
| const GrFontDescKey* fFontScalerKey; |
| - GrTAllocPool<GrGlyph> fPool; |
| + SkVarAlloc fPool; |
|
mtklein
2014/11/21 15:20:22
SkGlyphs look relatively small and relocatable. I
mtklein
2014/11/21 15:21:59
Err, was looking at SkGlyph. Looking at GrGlyph,
|
| GrFontCache* fFontCache; |
| bool fUseDistanceField; |