diff options
author | joshualitt <joshualitt@chromium.org> | 2015-12-10 09:10:10 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-12-10 09:10:10 -0800 |
commit | 1acabf3787bdaccd70ed53e64b3957d27ea34f79 (patch) | |
tree | d4763f0d4e2c809ddca4bd1e7a7b97c9b385871b /src/gpu/batches/GrAtlasTextBatch.h | |
parent | f10ecb71a9189b3551fdc01300b5c56ad76c6a71 (diff) |
Move DistanceAdjustTable to its own file
BUG=skia:
Review URL: https://codereview.chromium.org/1512823004
Diffstat (limited to 'src/gpu/batches/GrAtlasTextBatch.h')
-rw-r--r-- | src/gpu/batches/GrAtlasTextBatch.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/gpu/batches/GrAtlasTextBatch.h b/src/gpu/batches/GrAtlasTextBatch.h index 5fd3d6110f..edbe3d7813 100644 --- a/src/gpu/batches/GrAtlasTextBatch.h +++ b/src/gpu/batches/GrAtlasTextBatch.h @@ -11,6 +11,7 @@ #include "batches/GrVertexBatch.h" #include "GrAtlasTextContext.h" +#include "GrDistanceFieldAdjustTable.h" class GrAtlasTextBatch : public GrVertexBatch { public: @@ -19,7 +20,6 @@ public: static const int kVerticesPerGlyph = GrAtlasTextBlob::kVerticesPerGlyph; static const int kIndicesPerGlyph = 6; - typedef GrAtlasTextContext::DistanceAdjustTable DistanceAdjustTable; typedef GrAtlasTextBlob Blob; typedef Blob::Run Run; typedef Run::SubRunInfo TextInfo; @@ -56,10 +56,11 @@ public: return batch; } - static GrAtlasTextBatch* CreateDistanceField(int glyphCount, GrBatchFontCache* fontCache, - const DistanceAdjustTable* distanceAdjustTable, - SkColor filteredColor, bool isLCD, - bool useBGR) { + static GrAtlasTextBatch* CreateDistanceField( + int glyphCount, GrBatchFontCache* fontCache, + const GrDistanceFieldAdjustTable* distanceAdjustTable, + SkColor filteredColor, bool isLCD, + bool useBGR) { GrAtlasTextBatch* batch = new GrAtlasTextBatch; batch->fFontCache = fontCache; @@ -196,7 +197,7 @@ private: GrBatchFontCache* fFontCache; // Distance field properties - SkAutoTUnref<const DistanceAdjustTable> fDistanceAdjustTable; + SkAutoTUnref<const GrDistanceFieldAdjustTable> fDistanceAdjustTable; SkColor fFilteredColor; typedef GrVertexBatch INHERITED; |