GrAtlas refactor: Replace GrMaskFormat usage in GrAtlas with GrPixelConfig.

src/gpu/GrAtlas.h

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 
 #ifndef GrAtlas_DEFINED
 #define GrAtlas_DEFINED
 
 #include "GrPoint.h"
 #include "GrTexture.h"
 #include "GrDrawTarget.h"
 
 class GrGpu;
 class GrRectanizer;
 class GrAtlasMgr;
 
 class GrAtlas {
 public:
     int getPlotX() const { return fPlot.fX; }
     int getPlotY() const { return fPlot.fY; }
-    GrMaskFormat getMaskFormat() const { return fMaskFormat; }
 
     GrTexture* texture() const { return fTexture; }
 
     bool addSubImage(int width, int height, const void*, GrIPoint16*);
 
     static void FreeLList(GrAtlas* atlas) {
         while (NULL != atlas) {
             GrAtlas* next = atlas->fNext;
             delete atlas;
             atlas = next;
         }
     }
 
     static bool RemoveUnusedAtlases(GrAtlasMgr* atlasMgr, GrAtlas** startAtlas);
 
     GrDrawTarget::DrawToken drawToken() const { return fDrawToken; }
     void setDrawToken(GrDrawTarget::DrawToken draw) { fDrawToken = draw; }
 
 private:
-    GrAtlas(GrAtlasMgr*, int plotX, int plotY, GrMaskFormat format);
+    GrAtlas(GrAtlasMgr*, int plotX, int plotY, int bpp);
     ~GrAtlas(); // does not try to delete the fNext field
 
     // for recycling
     GrDrawTarget::DrawToken fDrawToken;
 
     GrAtlas*                fNext;
 
     GrTexture*              fTexture;
     GrRectanizer*           fRects;
     GrAtlasMgr*             fAtlasMgr;
     GrIPoint16              fPlot;
-    GrMaskFormat            fMaskFormat;
+    int                     fBytesPerPixel;
 
     friend class GrAtlasMgr;
 };
 
 class GrPlotMgr;
 
 class GrAtlasMgr {
 public:
-    GrAtlasMgr(GrGpu*, GrMaskFormat);
+    GrAtlasMgr(GrGpu*, GrPixelConfig);
     ~GrAtlasMgr();
 
     GrAtlas* addToAtlas(GrAtlas**, int width, int height, const void*, GrIPoint16*);
     void deleteAtlas(GrAtlas* atlas) { delete atlas; }
 
     GrTexture* getTexture() const {
         return fTexture;
     }
 
     // to be called by ~GrAtlas()
     void freePlot(int x, int y);
 
 private:
-    GrGpu*       fGpu;
-    GrMaskFormat fMaskFormat;
-    GrTexture*   fTexture;
-    GrPlotMgr*   fPlotMgr;
+    GrGpu*        fGpu;
+    GrPixelConfig fPixelConfig;
+    GrTexture*    fTexture;
+    GrPlotMgr*    fPlotMgr;
 };
 
 #endif