diff options
| author |  joshualitt <joshualitt@chromium.org> | 2015-03-31 11:04:53 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-31 11:04:53 -0700 |
| commit | eed1dae04932483579b02c10f0706127d3f5d984 (patch) | |
| tree | 4a70b34ba6d1c908cfa7491531bb49446e18fcf4 /src/gpu/GrGlyph.h | |
| parent | 2a3c8493af6efe2256025b6cfbec882845925bd0 (diff) | |
BitmapTextBatch and BitmapTextBlob
BUG=skia:
Review URL: https://codereview.chromium.org/1011403004
Diffstat (limited to 'src/gpu/GrGlyph.h')
| -rw-r--r-- | src/gpu/GrGlyph.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/gpu/GrGlyph.h b/src/gpu/GrGlyph.h index 108f2f0fe7..2d3e945ddb 100644 --- a/src/gpu/GrGlyph.h +++ b/src/gpu/GrGlyph.h @@ -8,6 +8,7 @@ #ifndef GrGlyph_DEFINED #define GrGlyph_DEFINED +#include "GrBatchAtlas.h" #include "GrRect.h" #include "GrTypes.h" @@ -30,14 +31,17 @@ struct GrGlyph { typedef uint32_t PackedID; - GrPlot* fPlot; - SkPath* fPath; - PackedID fPackedID; - GrMaskFormat fMaskFormat; - GrIRect16 fBounds; - SkIPoint16 fAtlasLocation; + // 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; void init(GrGlyph::PackedID packed, const SkIRect& bounds, GrMaskFormat format) { + fID = GrBatchAtlas::kInvalidAtlasID; fPlot = NULL; fPath = NULL; fPackedID = packed; |