diff options
| -rw-r--r-- | src/gpu/GrBatchFontCache.cpp | 1 | ||||
| -rw-r--r-- | src/gpu/GrGlyph.h | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/gpu/GrBatchFontCache.cpp b/src/gpu/GrBatchFontCache.cpp index dc5b43a547..d6ffc507e7 100644 --- a/src/gpu/GrBatchFontCache.cpp +++ b/src/gpu/GrBatchFontCache.cpp @@ -201,7 +201,6 @@ bool GrBatchTextStrike::addGlyphToAtlas(GrBatchTarget* batchTarget, GrGlyph* gly SkASSERT(glyph); SkASSERT(scaler); SkASSERT(fCache.find(glyph->fPackedID)); - SkASSERT(NULL == glyph->fPlot); SkAutoUnref ar(SkSafeRef(scaler)); diff --git a/src/gpu/GrGlyph.h b/src/gpu/GrGlyph.h index 8750c763e5..6a4166f5ff 100644 --- a/src/gpu/GrGlyph.h +++ b/src/gpu/GrGlyph.h @@ -31,9 +31,7 @@ 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; @@ -43,7 +41,6 @@ struct GrGlyph { void init(GrGlyph::PackedID packed, const SkIRect& bounds, GrMaskFormat format) { fID = GrBatchAtlas::kInvalidAtlasID; - fPlot = NULL; fPath = NULL; fPackedID = packed; fBounds.set(bounds); |