Remove some fields from BitmapTextBatch

src/gpu/GrBatchFontCache.cpp

Index: src/gpu/GrBatchFontCache.cpp
diff --git a/src/gpu/GrBatchFontCache.cpp b/src/gpu/GrBatchFontCache.cpp
index aa0526007d39978e046e32bbc0e4286190406f86..6ffcdcf4230bb772b7faa843a9ac31fc271a2055 100644
--- a/src/gpu/GrBatchFontCache.cpp
+++ b/src/gpu/GrBatchFontCache.cpp
@@ -39,7 +39,7 @@ static GrBatchAtlas* make_atlas(GrContext* context, GrPixelConfig config,
 bool GrBatchFontCache::initAtlas(GrMaskFormat format) {
     int index = MaskFormatToAtlasIndex(format);
     if (!fAtlases[index]) {
-        GrPixelConfig config = this->getPixelConfig(format);
+        GrPixelConfig config = MaskFormatToPixelConfig(format);
         if (kA8_GrMaskFormat == format) {
             fAtlases[index] = make_atlas(fContext, config,
                                          GR_FONT_ATLAS_A8_TEXTURE_WIDTH,
@@ -99,17 +99,6 @@ void GrBatchFontCache::freeAll() {
     }
 }
 
-GrPixelConfig GrBatchFontCache::getPixelConfig(GrMaskFormat format) const {
-    static const GrPixelConfig kPixelConfigs[] = {
-        kAlpha_8_GrPixelConfig,
-        kRGB_565_GrPixelConfig,
-        kSkia8888_GrPixelConfig
-    };
-    SK_COMPILE_ASSERT(SK_ARRAY_COUNT(kPixelConfigs) == kMaskFormatCount, array_size_mismatch);
-
-    return kPixelConfigs[format];
-}
-
 void GrBatchFontCache::HandleEviction(GrBatchAtlas::AtlasID id, void* ptr) {
     GrBatchFontCache* fontCache = reinterpret_cast<GrBatchFontCache*>(ptr);