Remove some fields from BitmapTextBatch

src/gpu/GrAtlasTextContext.h

Index: src/gpu/GrAtlasTextContext.h
diff --git a/src/gpu/GrAtlasTextContext.h b/src/gpu/GrAtlasTextContext.h
index 9e49bba37ec7551c8de0f9d37a02a6e522532f4c..e89f98719c3404396c670d7d30042031397759fb 100644
--- a/src/gpu/GrAtlasTextContext.h
+++ b/src/gpu/GrAtlasTextContext.h
@@ -18,7 +18,6 @@
 #include "GrBatchTest.h"
 #endif
 
-class BitmapTextBatch;
 class GrDrawContext;
 class GrDrawTarget;
 class GrPipelineBuilder;
@@ -75,10 +74,10 @@ private:
                                 const SkPaint&, SkDrawFilter*,
                                 const SkMatrix& viewMatrix, const SkIRect& clipBounds, SkScalar x,
                                 SkScalar y);
-    inline BitmapTextBatch* createBatch(GrAtlasTextBlob*, const PerSubRunInfo&,
-                                        int glyphCount, int run, int subRun,
-                                        GrColor, SkScalar transX, SkScalar transY,
-                                        const SkPaint&);
+    inline GrBatch* createBatch(GrAtlasTextBlob*, const PerSubRunInfo&,
+                                int glyphCount, int run, int subRun,
+                                GrColor, SkScalar transX, SkScalar transY,
+                                const SkPaint&);
     inline void flushRun(GrPipelineBuilder*, GrAtlasTextBlob*, int run, GrColor,
                          SkScalar transX, SkScalar transY, const SkPaint&);
     inline void flushBigGlyphs(GrAtlasTextBlob* cacheBlob, GrRenderTarget*,
@@ -183,7 +182,7 @@ private:
     SkAutoTUnref<DistanceAdjustTable> fDistanceAdjustTable;
 
     friend class GrTextBlobCache;
-    friend class BitmapTextBatch;
+    friend class TextBatch;
 
 #ifdef GR_TEST_UTILS
     BATCH_TEST_FRIEND(TextBlobBatch);