Remove some fields from BitmapTextBatch

src/gpu/GrBatchFontCache.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrBatchFontCache.h"
 #include "GrContext.h"
 #include "GrFontAtlasSizes.h"
@@ skipping 21 matching lines @@
         desc, GrTextureProvider::kApprox_ScratchTexMatch, true);
     if (!texture) {
         return NULL;
     }
     return SkNEW_ARGS(GrBatchAtlas, (texture, numPlotsX, numPlotsY));
 }
 
 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,
                                          GR_FONT_ATLAS_TEXTURE_HEIGHT,
                                          GR_FONT_ATLAS_A8_NUM_PLOTS_X,
                                          GR_FONT_ATLAS_NUM_PLOTS_Y);
         } else {
             fAtlases[index] = make_atlas(fContext, config,
                                          GR_FONT_ATLAS_TEXTURE_WIDTH,
                                          GR_FONT_ATLAS_TEXTURE_HEIGHT,
@@ skipping 39 matching lines @@
         (*iter).unref();
         ++iter;
     }
     fCache.rewind();
     for (int i = 0; i < kMaskFormatCount; ++i) {
         SkDELETE(fAtlases[i]);
         fAtlases[i] = NULL;
     }
 }
 
-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);
 
     SkTDynamicHash<GrBatchTextStrike, GrFontDescKey>::Iter iter(&fontCache->fCache);
     for (; !iter.done(); ++iter) {
         GrBatchTextStrike* strike = &*iter;
         strike->removeID(id);
 
         // clear out any empty strikes.  We will preserve the strike whose call to addToAtlas
         // triggered the eviction
@@ skipping 113 matching lines @@
     }
 
     bool success = fBatchFontCache->addToAtlas(this, &glyph->fID, batchTarget, glyph->fMaskFormat,
                                                glyph->width(), glyph->height(),
                                                storage.get(), &glyph->fAtlasLocation);
     if (success) {
         fAtlasedGlyphs++;
     }
     return success;
 }