Adjust atlas sizes to fix Mali400 precision issues

src/gpu/GrFontCache.cpp

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrFontCache.h"
 #include "GrFontAtlasSizes.h"
 #include "GrGpu.h"
@@ skipping 95 matching lines @@
     delete strike;
 }
 
 
 GrPlot* GrFontCache::addToAtlas(GrMaskFormat format, GrAtlas::ClientPlotUsage* usage,
                                 int width, int height, const void* image,
                                 SkIPoint16* loc) {
     GrPixelConfig config = mask_format_to_pixel_config(format);
     int atlasIndex = mask_format_to_atlas_index(format);
     if (NULL == fAtlases[atlasIndex]) {
-        SkISize textureSize = SkISize::Make(GR_FONT_ATLAS_TEXTURE_WIDTH,
-                                            GR_FONT_ATLAS_TEXTURE_HEIGHT);
-        fAtlases[atlasIndex] = SkNEW_ARGS(GrAtlas, (fGpu, config, kNone_GrSurfaceFlags,
-                                                    textureSize,
-                                                    GR_FONT_ATLAS_NUM_PLOTS_X,
-                                                    GR_FONT_ATLAS_NUM_PLOTS_Y,
-                                                    true));
+        if (kA8_GrMaskFormat == format) {
+            SkISize textureSize = SkISize::Make(GR_FONT_ATLAS_A8_TEXTURE_WIDTH,
+                                                GR_FONT_ATLAS_TEXTURE_HEIGHT);
+            fAtlases[atlasIndex] = SkNEW_ARGS(GrAtlas, (fGpu, config, kNone_GrSurfaceFlags,
+                                                        textureSize,
+                                                        GR_FONT_ATLAS_A8_NUM_PLOTS_X,
+                                                        GR_FONT_ATLAS_NUM_PLOTS_Y,
+                                                        true));
+        } else {
+            SkISize textureSize = SkISize::Make(GR_FONT_ATLAS_TEXTURE_WIDTH,
+                                                GR_FONT_ATLAS_TEXTURE_HEIGHT);
+            fAtlases[atlasIndex] = SkNEW_ARGS(GrAtlas, (fGpu, config, kNone_GrSurfaceFlags,
+                                                        textureSize,
+                                                        GR_FONT_ATLAS_NUM_PLOTS_X,
+                                                        GR_FONT_ATLAS_NUM_PLOTS_Y,
+                                                        true));
+        }
     }
     return fAtlases[atlasIndex]->addToAtlas(usage, width, height, image, loc);
 }
 
 
 bool GrFontCache::freeUnusedPlot(GrTextStrike* preserveStrike, const GrGlyph* glyph) {
     SkASSERT(preserveStrike);
 
     int index = mask_format_to_atlas_index(glyph->fMaskFormat);
     GrAtlas* atlas = fAtlases[index];
@@ skipping 141 matching lines @@
         ++iter;
     }
 
     GrAtlas::RemovePlot(&fPlotUsage, plot);
 }
 
 bool GrTextStrike::glyphTooLargeForAtlas(GrGlyph* glyph) {
     int width = glyph->fBounds.width();
     int height = glyph->fBounds.height();
     int pad = fUseDistanceField ? 2 * SK_DistanceFieldPad : 0;
-    if (width + pad > GR_FONT_ATLAS_PLOT_WIDTH) {
+    int plotWidth = (kA8_GrMaskFormat == glyph->fMaskFormat) ? GR_FONT_ATLAS_A8_PLOT_WIDTH
+                                                             : GR_FONT_ATLAS_PLOT_WIDTH;
+    if (width + pad > plotWidth) {
         return true;
     }
     if (height + pad > GR_FONT_ATLAS_PLOT_HEIGHT) {
         return true;
     }
 
     return false;
 }
 
 bool GrTextStrike::addGlyphToAtlas(GrGlyph* glyph, GrFontScaler* scaler) {
@@ skipping 33 matching lines @@
                                           glyph->width(), glyph->height(),
                                           storage.get(), &glyph->fAtlasLocation);
 
     if (NULL == plot) {
         return false;
     }
 
     glyph->fPlot = plot;
     return true;
 }