Revert of 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, const GrCaps& caps) {
+    static GrPixelConfig MaskFormatToPixelConfig(GrMaskFormat format) {
         static const GrPixelConfig kPixelConfigs[] = {
             kAlpha_8_GrPixelConfig,
             kRGB_565_GrPixelConfig,
-            caps.srgbSupport() ? kSkiaGamma8888_GrPixelConfig : kSkia8888_GrPixelConfig
+            kSkia8888_GrPixelConfig
         };
         static_assert(SK_ARRAY_COUNT(kPixelConfigs) == kMaskFormatCount, "array_size_mismatch");
 
         return kPixelConfigs[format];
     }
 
     // There is a 1:1 mapping between GrMaskFormats and atlas indices
     static int MaskFormatToAtlasIndex(GrMaskFormat format) {
         static const int sAtlasIndices[] = {
             kA8_GrMaskFormat,
@@ skipping 24 matching lines @@
 
     using StrikeHash = SkTDynamicHash<GrBatchTextStrike, SkDescriptor>;
     GrContext* fContext;
     StrikeHash fCache;
     GrBatchAtlas* fAtlases[kMaskFormatCount];
     GrBatchTextStrike* fPreserveStrike;
     GrBatchAtlasConfig fAtlasConfigs[kMaskFormatCount];
 };
 
 #endif