GrAtlas refactor: Replace GrMaskFormat usage in GrAtlas with GrPixelConfig.

src/gpu/GrTextStrike.cpp

Index: src/gpu/GrTextStrike.cpp
diff --git a/src/gpu/GrTextStrike.cpp b/src/gpu/GrTextStrike.cpp
index 5798e5f3505581dfcb75aad37e8570c534be12e3..a83c815ae3461b78c4b7050c38d6b4f55e8d235f 100644
--- a/src/gpu/GrTextStrike.cpp
+++ b/src/gpu/GrTextStrike.cpp
@@ -41,15 +41,29 @@ GrFontCache::~GrFontCache() {
 #endif
 }
 

[robertphillips, 2013/09/26 13:47:35]

mask_format_2_pixel_config?

[jvanverth1, 2013/09/26 15:16:07]

Done.

+static GrPixelConfig maskformat2pixelconfig(GrMaskFormat format) {
+    switch (format) {
+        case kA8_GrMaskFormat:
+            return kAlpha_8_GrPixelConfig;
+        case kA565_GrMaskFormat:
+            return kRGB_565_GrPixelConfig;
+        case kA888_GrMaskFormat:
+            return kSkia8888_GrPixelConfig;
+        default:
+            SkDEBUGFAIL("unknown maskformat");
+    }
+    return kUnknown_GrPixelConfig;
+}
+
 GrTextStrike* GrFontCache::generateStrike(GrFontScaler* scaler,
                                           const Key& key) {
     GrMaskFormat format = scaler->getMaskFormat();
+    GrPixelConfig config = maskformat2pixelconfig(format);
     if (NULL == fAtlasMgr[format]) {
-        fAtlasMgr[format] = SkNEW_ARGS(GrAtlasMgr, (fGpu, format));
+        fAtlasMgr[format] = SkNEW_ARGS(GrAtlasMgr, (fGpu, config));
     }
     GrTextStrike* strike = SkNEW_ARGS(GrTextStrike,
-                                      (this, scaler->getKey(),
-                                       scaler->getMaskFormat(), fAtlasMgr[format]));
+                                      (this, scaler->getKey(), format, fAtlasMgr[format]));
     fCache.insert(key, strike);
 
     if (fHead) {