Clean up GrBatchAtlas a bit

src/gpu/GrBatchAtlas.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrBatchAtlas_DEFINED
 #define GrBatchAtlas_DEFINED
 
 #include "GrTexture.h"
 #include "batches/GrDrawBatch.h"
 #include "SkPoint.h"
 #include "SkTDArray.h"
 #include "SkTInternalLList.h"
 
 class BatchPlot;
 class GrRectanizer;
 
-typedef SkTInternalLList<BatchPlot> GrBatchPlotList;
-
 struct GrBatchAtlasConfig {
     int numPlotsX() const { return fWidth / fPlotWidth; }
     int numPlotsY() const { return fHeight / fPlotWidth; }
     int fWidth;
     int fHeight;
     int fPlotWidth;
     int fPlotHeight;
 };
 
 class GrBatchAtlas {
@@ skipping 81 matching lines @@
     };
 
     void setLastUseTokenBulk(const BulkUseTokenUpdater& reffer, GrBatchToken);
 
     static const int kGlyphMaxDim = 256;
     static bool GlyphTooLargeForAtlas(int width, int height) {
         return width > kGlyphMaxDim || height > kGlyphMaxDim;
     }
 
 private:
+    typedef SkTInternalLList<BatchPlot> GrBatchPlotList;
+
     static uint32_t GetIndexFromID(AtlasID id) {
         return id & 0xffff;
     }
 
     // top 48 bits are reserved for the generation ID
     static uint64_t GetGenerationFromID(AtlasID id) {
         return (id >> 16) & 0xffffffffffff;
     }
 
     inline void updatePlot(GrDrawBatch::Target*, AtlasID*, BatchPlot*);
 
     inline void makeMRU(BatchPlot* plot);
 
     inline void processEviction(AtlasID);
 
     GrTexture* fTexture;
-    uint32_t fNumPlotsX;
-    uint32_t fNumPlotsY;
-    uint32_t fPlotWidth;
-    uint32_t fPlotHeight;
-    size_t fBPP;
+    SkDEBUGCODE(uint32_t fNumPlots;)
+
     uint64_t fAtlasGeneration;
 
     struct EvictionData {
         EvictionFunc fFunc;
         void* fData;
     };
 
     SkTDArray<EvictionData> fEvictionCallbacks;
     // allocated array of GrBatchPlots
     SkAutoTUnref<BatchPlot>* fPlotArray;
     // LRU list of GrPlots (MRU at head - LRU at tail)
     GrBatchPlotList fPlotList;
 };
 
 #endif