Revert of Fix gamut GM to work w/serialization configs. Remove it from blacklist.

gm/gamut.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 
 #include "SkSurface.h"
@@ skipping 107 matching lines @@
     const float gWideGamutRGB_toXYZD50[]{
         0.7161046f, 0.1009296f, 0.1471858f,  // -> X
         0.2581874f, 0.7249378f, 0.0168748f,  // -> Y
         0.0000000f, 0.0517813f, 0.7734287f,  // -> Z
     };
 
     SkMatrix44 wideGamutRGB_toXYZD50(SkMatrix44::kUninitialized_Constructor);
     wideGamutRGB_toXYZD50.set3x3RowMajorf(gWideGamutRGB_toXYZD50);
 
     // Use the original canvas' color type, but account for gamma requirements
-    SkColorType colorType = canvas->imageInfo().colorType();
-    if (kUnknown_SkColorType == colorType) {
-        // This can happen when recording (in which case we'll just use 8888 offscreen surfaces)
-        colorType = kN32_SkColorType;
-    }
+    SkImageInfo origInfo = canvas->imageInfo();
     auto srgbCS = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);
     auto wideCS = SkColorSpace::NewRGB(SkColorSpace::kSRGB_RenderTargetGamma,
                                        wideGamutRGB_toXYZD50);
-    switch (colorType) {
+    switch (origInfo.colorType()) {
         case kRGBA_8888_SkColorType:
         case kBGRA_8888_SkColorType:
             break;
         case kRGBA_F16_SkColorType:
             srgbCS = srgbCS->makeLinearGamma();
             wideCS = wideCS->makeLinearGamma();
             break;
         default:
             return;
     }
 
     // Make our two working surfaces (one sRGB, one Adobe)
-    SkImageInfo srgbGamutInfo = SkImageInfo::Make(gRectSize, gRectSize, colorType,
+    SkImageInfo srgbGamutInfo = SkImageInfo::Make(gRectSize, gRectSize, origInfo.colorType(),
                                                   kPremul_SkAlphaType, srgbCS);
-    SkImageInfo wideGamutInfo = SkImageInfo::Make(gRectSize, gRectSize, colorType,
+    SkImageInfo wideGamutInfo = SkImageInfo::Make(gRectSize, gRectSize, origInfo.colorType(),
                                                   kPremul_SkAlphaType, wideCS);
     // readPixels doesn't do color conversion (yet), so we can use it to see the raw (wide) data
     SkImageInfo dstInfo = srgbGamutInfo.makeColorSpace(nullptr);
     sk_sp<SkSurface> srgbGamutSurface = canvas->makeSurface(srgbGamutInfo);
-    if (!srgbGamutSurface) {
-        srgbGamutSurface = SkSurface::MakeRaster(srgbGamutInfo);
-    }
     sk_sp<SkSurface> wideGamutSurface = canvas->makeSurface(wideGamutInfo);
-    if (!wideGamutSurface) {
-        wideGamutSurface = SkSurface::MakeRaster(wideGamutInfo);
+    if (!srgbGamutSurface || !wideGamutSurface) {
+        return;
     }
     SkCanvas* srgbGamutCanvas = srgbGamutSurface->getCanvas();
     SkCanvas* wideGamutCanvas = wideGamutSurface->getCanvas();
 
     SkPaint textPaint;
     textPaint.setAntiAlias(true);
     textPaint.setColor(SK_ColorWHITE);
     sk_tool_utils::set_portable_typeface(&textPaint);
 
     SkScalar x = 0, y = 0;
@@ skipping 53 matching lines @@
     renderers.push_back(new GradientCellRenderer(SK_ColorRED, SK_ColorGREEN, true));
     renderers.push_back(new GradientCellRenderer(SK_ColorGREEN, SK_ColorBLACK, true));
     renderers.push_back(new GradientCellRenderer(SK_ColorGREEN, SK_ColorWHITE, true));
 
     // Vertex colors
     renderers.push_back(new VerticesCellRenderer(SK_ColorRED, SK_ColorRED));
     renderers.push_back(new VerticesCellRenderer(SK_ColorRED, SK_ColorGREEN));
 
     draw_gamut_grid(canvas, renderers);
 }