Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(307)

Unified Diff: src/gpu/GrTextStrike.h

Issue 742253002: remove GrAllocPool (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: feedback inc Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/GrAllocPool.cpp ('k') | src/gpu/GrTextStrike.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
GrFontCache* fFontCache;
bool fUseDistanceField;
« no previous file with comments | « src/gpu/GrAllocPool.cpp ('k') | src/gpu/GrTextStrike.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698