Use sRGB pixel config for ARGB masks (color emoji)

src/gpu/text/GrBatchFontCache.h

Index: src/gpu/text/GrBatchFontCache.h
diff --git a/src/gpu/text/GrBatchFontCache.h b/src/gpu/text/GrBatchFontCache.h
index 42612fe8b67b0d0caea9eed3445ccb6683a15dcf..2aa67ddebee22bbfe821a66b4b803f500fd75a01 100644
--- a/src/gpu/text/GrBatchFontCache.h
+++ b/src/gpu/text/GrBatchFontCache.h
@@ -186,15 +186,18 @@ public:
     void setAtlasSizes_ForTesting(const GrBatchAtlasConfig configs[3]);
 
 private:
-    static GrPixelConfig MaskFormatToPixelConfig(GrMaskFormat format) {
-        static const GrPixelConfig kPixelConfigs[] = {
-            kAlpha_8_GrPixelConfig,
-            kRGB_565_GrPixelConfig,
-            kSkia8888_GrPixelConfig
-        };
-        static_assert(SK_ARRAY_COUNT(kPixelConfigs) == kMaskFormatCount, "array_size_mismatch");
-
-        return kPixelConfigs[format];
+    static GrPixelConfig MaskFormatToPixelConfig(GrMaskFormat format, const GrCaps& caps) {
+        switch (format) {

[Brian Osman, 2016/07/07 20:42:34]

First version of this change was failing on ANGLE bots: The table is
function-static, so we would cache the sRGB pixel config for ARGB masks (when
the bots first tested a non-ANGLE config). Then we'd try and run ANGLE (which
doesn't support sRGB) and it would still try to use the (unsupported) sRGB
config. Doh.

+            case kA8_GrMaskFormat:
+                return kAlpha_8_GrPixelConfig;
+            case kA565_GrMaskFormat:
+                return kRGB_565_GrPixelConfig;
+            case kARGB_GrMaskFormat:
+                return caps.srgbSupport() ? kSkiaGamma8888_GrPixelConfig : kSkia8888_GrPixelConfig;
+            default:
+                SkDEBUGFAIL("unsupported GrMaskFormat");
+                return kAlpha_8_GrPixelConfig;
+        }
     }
 
     // There is a 1:1 mapping between GrMaskFormats and atlas indices