Make GPU configs use kRGBA color type not kN32.

tools/flags/SkCommonFlagsConfig.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCommonFlagsConfig.h"
 #include "SkImageInfo.h"
 
@@ skipping 249 matching lines @@
         *outContextType = GrContextFactory::kVulkan_ContextType;
         return true;
     }
 #endif
     return false;
 }
 static bool parse_option_gpu_color(const SkString& value,
                                    SkColorType* outColorType,
                                    sk_sp<SkColorSpace>* outColorSpace) {
     if (value.equals("8888")) {
-        *outColorType = kN32_SkColorType;
+        *outColorType = kRGBA_8888_SkColorType;
         *outColorSpace = nullptr;
         return true;
     }
 
     SkTArray<SkString> commands;
     SkStrSplit(value.c_str(), "_", &commands);
     if (commands.count() < 1 || commands.count() > 2) {
         return false;
     }
 
@@ skipping 19 matching lines @@
         }
     }
 
     // Now pick a color type
     if (commands[0].equals("f16")) {
         *outColorType = kRGBA_F16_SkColorType;
         *outColorSpace = colorSpace->makeLinearGamma();
         return true;
     }
     if (commands[0].equals("srgb")) {
-        *outColorType = kN32_SkColorType;
+        *outColorType = kRGBA_8888_SkColorType;
         *outColorSpace = colorSpace;
         return true;
     }
     return false;
 }
 
 SkCommandLineConfigGpu* parse_command_line_config_gpu(const SkString& tag,
                                                       const SkTArray<SkString>& vias,
                                                       const SkString& options) {
     // Defaults for GPU backend.
     bool seenAPI = false;
     SkCommandLineConfigGpu::ContextType contextType = GrContextFactory::kNativeGL_ContextType;
     bool seenUseNVPR = false;
     bool useNVPR = false;
     bool seenUseInstanced = false;
     bool useInstanced = false;
     bool seenUseDIText =false;
     bool useDIText = false;
     bool seenSamples = false;
     int samples = 0;
     bool seenColor = false;
-    SkColorType colorType = kN32_SkColorType;
+    SkColorType colorType = kRGBA_8888_SkColorType;
     sk_sp<SkColorSpace> colorSpace = nullptr;
 
     SkTArray<SkString> optionParts;
     SkStrSplit(options.c_str(), ",", kStrict_SkStrSplitMode, &optionParts);
     for (int i = 0; i < optionParts.count(); ++i) {
         SkTArray<SkString> keyValueParts;
         SkStrSplit(optionParts[i].c_str(), "=", kStrict_SkStrSplitMode, &keyValueParts);
         if (keyValueParts.count() != 2) {
             return nullptr;
         }
@@ skipping 83 matching lines @@
         if (extendedBackend.equals("gpu")) {
             parsedConfig = parse_command_line_config_gpu(tag, vias, extendedOptions);
         }
 #endif
         if (!parsedConfig) {
             parsedConfig = new SkCommandLineConfig(tag, simpleBackend, vias);
         }
         outResult->emplace_back(parsedConfig);
     }
 }