diff options
Diffstat (limited to 'include/gpu/GrGlyph.h')
-rw-r--r-- | include/gpu/GrGlyph.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/include/gpu/GrGlyph.h b/include/gpu/GrGlyph.h index a379144a42..0e534d694a 100644 --- a/include/gpu/GrGlyph.h +++ b/include/gpu/GrGlyph.h @@ -9,8 +9,10 @@ #define GrGlyph_DEFINED #include "GrRect.h" -#include "SkPath.h" +#include "GrTypes.h" + #include "SkChecksum.h" +#include "SkPath.h" class GrPlot; @@ -23,17 +25,19 @@ class GrPlot; struct GrGlyph { typedef uint32_t PackedID; - GrPlot* fPlot; - SkPath* fPath; - PackedID fPackedID; - GrIRect16 fBounds; - SkIPoint16 fAtlasLocation; + GrPlot* fPlot; + SkPath* fPath; + PackedID fPackedID; + GrMaskFormat fMaskFormat; + GrIRect16 fBounds; + SkIPoint16 fAtlasLocation; - void init(GrGlyph::PackedID packed, const SkIRect& bounds) { + void init(GrGlyph::PackedID packed, const SkIRect& bounds, GrMaskFormat format) { fPlot = NULL; fPath = NULL; fPackedID = packed; fBounds.set(bounds); + fMaskFormat = format; fAtlasLocation.set(0, 0); } |