Use sRGB pixel config for ARGB masks (color emoji)

src/gpu/text/GrBatchFontCache.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 GrBatchFontCache_DEFINED
 #define GrBatchFontCache_DEFINED
 
@@ skipping 168 matching lines @@
     int log2Width(GrMaskFormat format) { return fAtlasConfigs[format].fLog2Width; }
     int log2Height(GrMaskFormat format) { return fAtlasConfigs[format].fLog2Height; }
 
     ///////////////////////////////////////////////////////////////////////////
     // Functions intended debug only
     void dump() const;
 
     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
     static int MaskFormatToAtlasIndex(GrMaskFormat format) {
         static const int sAtlasIndices[] = {
             kA8_GrMaskFormat,
             kA565_GrMaskFormat,
             kARGB_GrMaskFormat,
         };
         static_assert(SK_ARRAY_COUNT(sAtlasIndices) == kMaskFormatCount, "array_size_mismatch");
@@ skipping 20 matching lines @@
 
     using StrikeHash = SkTDynamicHash<GrBatchTextStrike, SkDescriptor>;
     GrContext* fContext;
     StrikeHash fCache;
     GrBatchAtlas* fAtlases[kMaskFormatCount];
     GrBatchTextStrike* fPreserveStrike;
     GrBatchAtlasConfig fAtlasConfigs[kMaskFormatCount];
 };
 
 #endif