Revert of Adjust distance field glyph and font atlas sizes to maximize storage.

src/gpu/GrFontAtlasSizes.h

Index: src/gpu/GrFontAtlasSizes.h
diff --git a/src/gpu/GrFontAtlasSizes.h b/src/gpu/GrFontAtlasSizes.h
index 626aefa7aa7744ca93c86a739db5f155e447242c..24897e4a7ae2e0d4539767b8d0d60f990f49abe8 100644
--- a/src/gpu/GrFontAtlasSizes.h
+++ b/src/gpu/GrFontAtlasSizes.h
@@ -9,27 +9,20 @@
 #ifndef GrFontAtlasSizes_DEFINED
 #define GrFontAtlasSizes_DEFINED
 
-#include "SkDistanceFieldGen.h"
+#define GR_FONT_ATLAS_TEXTURE_WIDTH  1024
+#define GR_FONT_ATLAS_TEXTURE_HEIGHT 2048
 
-#define GR_SDF_MAX_SIZE              156
+#define GR_FONT_ATLAS_PLOT_WIDTH     256
+#define GR_FONT_ATLAS_PLOT_HEIGHT    256
 
-// allows us to fit four of the largest distance field glyphs
-#define GR_FONT_ATLAS_PLOT_WIDTH     (2*(GR_SDF_MAX_SIZE+2*SK_DistanceFieldPad))
-#define GR_FONT_ATLAS_PLOT_HEIGHT    (2*(GR_SDF_MAX_SIZE+2*SK_DistanceFieldPad))
-
-#define GR_FONT_ATLAS_NUM_PLOTS_X    4
-#define GR_FONT_ATLAS_NUM_PLOTS_Y    8
-
-#define GR_FONT_ATLAS_TEXTURE_WIDTH  (GR_FONT_ATLAS_PLOT_WIDTH*GR_FONT_ATLAS_NUM_PLOTS_X)
-SK_COMPILE_ASSERT(GR_FONT_ATLAS_TEXTURE_WIDTH == 1312, font_atlas_unexpected_size);
-#define GR_FONT_ATLAS_TEXTURE_HEIGHT (GR_FONT_ATLAS_PLOT_HEIGHT*GR_FONT_ATLAS_NUM_PLOTS_Y)
-SK_COMPILE_ASSERT(GR_FONT_ATLAS_TEXTURE_HEIGHT == 2624, font_atlas_unexpected_size);
+#define GR_FONT_ATLAS_NUM_PLOTS_X   (GR_FONT_ATLAS_TEXTURE_WIDTH / GR_FONT_ATLAS_PLOT_WIDTH)
+#define GR_FONT_ATLAS_NUM_PLOTS_Y   (GR_FONT_ATLAS_TEXTURE_HEIGHT / GR_FONT_ATLAS_PLOT_HEIGHT)
 
 // one over width and height
-#define GR_FONT_ATLAS_RECIP_WIDTH    "0.00076219512"
-#define GR_FONT_ATLAS_RECIP_HEIGHT   "0.00038109756"
+#define GR_FONT_ATLAS_RECIP_WIDTH    "0.0009765625"
+#define GR_FONT_ATLAS_RECIP_HEIGHT   "0.00048828125"
 
 // 1/(3*width)
-#define GR_FONT_ATLAS_LCD_DELTA      "0.00025406504"
+#define GR_FONT_ATLAS_LCD_DELTA      "0.00032552083"
 
 #endif