Revert of 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 2d3e945ddbe3fcd941054ef726da7a6fc84b6ff4..108f2f0fe7d5df231a8337da7090d0d72f553a7e 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 @@
     
     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;