diff options
Diffstat (limited to 'src/gpu/GrGlyph.h')
-rw-r--r-- | src/gpu/GrGlyph.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/gpu/GrGlyph.h b/src/gpu/GrGlyph.h index 2d3e945ddb..108f2f0fe7 100644 --- a/src/gpu/GrGlyph.h +++ b/src/gpu/GrGlyph.h @@ -8,7 +8,6 @@ #ifndef GrGlyph_DEFINED #define GrGlyph_DEFINED -#include "GrBatchAtlas.h" #include "GrRect.h" #include "GrTypes.h" @@ -31,17 +30,14 @@ struct GrGlyph { typedef uint32_t PackedID; - // TODO either plot or AtlasID will be valid, not both - GrBatchAtlas::AtlasID fID; - GrPlot* fPlot; - SkPath* fPath; - PackedID fPackedID; - GrMaskFormat fMaskFormat; - GrIRect16 fBounds; - SkIPoint16 fAtlasLocation; + GrPlot* fPlot; + SkPath* fPath; + PackedID fPackedID; + GrMaskFormat fMaskFormat; + GrIRect16 fBounds; + SkIPoint16 fAtlasLocation; void init(GrGlyph::PackedID packed, const SkIRect& bounds, GrMaskFormat format) { - fID = GrBatchAtlas::kInvalidAtlasID; fPlot = NULL; fPath = NULL; fPackedID = packed; |