diff options
| author |  joshualitt <joshualitt@google.com> | 2015-03-31 11:33:08 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-31 11:33:08 -0700 |
| commit | c03391e792a55219ddcb033475dc6b80e6a3e2f9 (patch) | |
| tree | 5671404cac5d89d58cf29fa961d65a357b791149 /src/gpu/GrGlyph.h | |
| parent | eed1dae04932483579b02c10f0706127d3f5d984 (diff) | |
Revert of BitmapTextBatch and BitmapTextBlob (patchset #18 id:360001 of https://codereview.chromium.org/1011403004/)
Reason for revert:
Breaks a unit test on mac
Original issue's description:
> BitmapTextBatch and BitmapTextBlob
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/eed1dae04932483579b02c10f0706127d3f5d984
TBR=fmalita@chromium.org,reed@google.com,jvanverth@google.com,robertphillips@google.com,bsalomon@google.com,jvanverth@chromium.org,joshualitt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1050633002
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; |