commit 307d6fd4b80ea0e074dcb175244016056b5fa7b7
author Herb Derby <herb@google.com> Thu Sep 06 14:50:22 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Sep 06 19:42:57 2018 +0000
tree ad740826721a8c2985a704363465c4123a83da8f
parent fc9624cb840ca089620a2f9e519bcc1260468712

Calculate numPlotsY from height

Add a compensating change to make A8 plot
size 512x512.

Change-Id: Iaca4327d07c629143ec7dfb9e294b8fed4b8135a
Reviewed-on: https://skia-review.googlesource.com/152420
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Herb Derby <herb@google.com>

src/gpu/GrDrawOpAtlas.h

diff --git a/src/gpu/GrDrawOpAtlas.h b/src/gpu/GrDrawOpAtlas.h
index 33843c4..e1253f0 100644
--- a/src/gpu/GrDrawOpAtlas.h
+++ b/src/gpu/GrDrawOpAtlas.h
@@ -19,7 +19,7 @@
 
 struct GrDrawOpAtlasConfig {
     int numPlotsX() const { return fWidth / fPlotWidth; }
-    int numPlotsY() const { return fHeight / fPlotWidth; }
+    int numPlotsY() const { return fHeight / fPlotHeight; }
     int fWidth;
     int fHeight;
     int fPlotWidth;

src/gpu/text/GrAtlasManager.cpp

diff --git a/src/gpu/text/GrAtlasManager.cpp b/src/gpu/text/GrAtlasManager.cpp
index e589b20..ddd0b03 100644
--- a/src/gpu/text/GrAtlasManager.cpp
+++ b/src/gpu/text/GrAtlasManager.cpp
@@ -52,7 +52,7 @@
     fAtlasConfigs[kA8_GrMaskFormat].fWidth = maxDim;
     fAtlasConfigs[kA8_GrMaskFormat].fHeight = maxDim;
     fAtlasConfigs[kA8_GrMaskFormat].fPlotWidth = maxPlot;
-    fAtlasConfigs[kA8_GrMaskFormat].fPlotHeight = minPlot;
+    fAtlasConfigs[kA8_GrMaskFormat].fPlotHeight = maxPlot;
 
     // A565 and ARGB use maxDim x minDim.
     fAtlasConfigs[kA565_GrMaskFormat].fWidth = minDim;