GrAtlas refactor: Replace GrMaskFormat usage in GrAtlas with GrPixelConfig.

src/gpu/GrAtlas.h

Index: src/gpu/GrAtlas.h
diff --git a/src/gpu/GrAtlas.h b/src/gpu/GrAtlas.h
index 3f9da8cb13703eeea01b5aaa7de95ba9b40f84a9..b2acaee8e277d35e0146745c41a4f7849d249424 100644
--- a/src/gpu/GrAtlas.h
+++ b/src/gpu/GrAtlas.h
@@ -23,7 +23,6 @@ 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; }
 
@@ -43,7 +42,7 @@ public:
     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
@@ -55,7 +54,7 @@ private:
     GrRectanizer*           fRects;
     GrAtlasMgr*             fAtlasMgr;
     GrIPoint16              fPlot;
-    GrMaskFormat            fMaskFormat;
+    int                     fBytesPerPixel;
 
     friend class GrAtlasMgr;
 };
@@ -64,7 +63,7 @@ class GrPlotMgr;
 
 class GrAtlasMgr {
 public:
-    GrAtlasMgr(GrGpu*, GrMaskFormat);
+    GrAtlasMgr(GrGpu*, GrPixelConfig);
     ~GrAtlasMgr();
 
     GrAtlas* addToAtlas(GrAtlas**, int width, int height, const void*, GrIPoint16*);
@@ -78,10 +77,10 @@ public:
     void freePlot(int x, int y);
 
 private:
-    GrGpu*       fGpu;
-    GrMaskFormat fMaskFormat;
-    GrTexture*   fTexture;
-    GrPlotMgr*   fPlotMgr;
+    GrGpu*        fGpu;
+    GrPixelConfig fPixelConfig;
+    GrTexture*    fTexture;
+    GrPlotMgr*    fPlotMgr;
 };
 
 #endif