BitmapTextBatch and BitmapTextBlob

src/gpu/GrGlyph.h

Index: src/gpu/GrGlyph.h
diff --git a/src/gpu/GrGlyph.h b/src/gpu/GrGlyph.h
index 108f2f0fe7d5df231a8337da7090d0d72f553a7e..468155eb79466e7989dcf3b02a0e475674bf0967 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,6 +31,8 @@ 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;
@@ -38,6 +41,7 @@ struct GrGlyph {
     SkIPoint16   fAtlasLocation;
 
     void init(GrGlyph::PackedID packed, const SkIRect& bounds, GrMaskFormat format) {
+        fID = GrBatchAtlas::kInvalidAtlasID;
         fPlot = NULL;
         fPath = NULL;
         fPackedID = packed;