From ab8241880d09eb1774b4993ca6df048a27b7020c Mon Sep 17 00:00:00 2001 From: brianosman Date: Thu, 16 Jun 2016 11:41:44 -0700 Subject: Revert of Lots of progress switching to SkColorSpace rather than SkColorProfileType (patchset #10 id:180001 of https://codereview.chromium.org/2069173002/ ) Reason for revert: Mac crashes in GrUploadPixmapToTexture Original issue's description: > Lots of progress on switching to SkColorSpace rather than SkColorProfileType > > Fixed a bunch of code in Ganesh, as well as usage of SkColorProfileType in most of our tools (DM, SampleApp, Viewer, nanobench, skiaserve, HelloWorld). > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2069173002 > > Committed: https://skia.googlesource.com/skia/+/6a61a875467646f8dbc37cfecf49e12d1f475170 TBR=reed@google.com,herb@google.com,msarett@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review-Url: https://codereview.chromium.org/2072813002 --- tools/flags/SkCommonFlagsConfig.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'tools/flags/SkCommonFlagsConfig.cpp') diff --git a/tools/flags/SkCommonFlagsConfig.cpp b/tools/flags/SkCommonFlagsConfig.cpp index d5c7a1d5bf..1c7920eb55 100644 --- a/tools/flags/SkCommonFlagsConfig.cpp +++ b/tools/flags/SkCommonFlagsConfig.cpp @@ -192,14 +192,14 @@ SkCommandLineConfig::~SkCommandLineConfig() { SkCommandLineConfigGpu::SkCommandLineConfigGpu( const SkString& tag, const SkTArray& viaParts, ContextType contextType, bool useNVPR, bool useDIText, int samples, - SkColorType colorType, sk_sp colorSpace) + SkColorType colorType, SkColorProfileType profileType) : SkCommandLineConfig(tag, SkString("gpu"), viaParts) , fContextType(contextType) , fUseNVPR(useNVPR) , fUseDIText(useDIText) , fSamples(samples) , fColorType(colorType) - , fColorSpace(std::move(colorSpace)) { + , fProfileType(profileType) { } static bool parse_option_int(const SkString& value, int* outInt) { if (value.isEmpty()) { @@ -276,20 +276,20 @@ static bool parse_option_gpu_api(const SkString& value, } static bool parse_option_gpu_color(const SkString& value, SkColorType* outColorType, - sk_sp* outColorSpace) { + SkColorProfileType* outProfileType) { if (value.equals("8888")) { *outColorType = kN32_SkColorType; - *outColorSpace = nullptr; + *outProfileType = kLinear_SkColorProfileType; return true; } if (value.equals("f16")) { *outColorType = kRGBA_F16_SkColorType; - *outColorSpace = nullptr; + *outProfileType = kLinear_SkColorProfileType; return true; } if (value.equals("srgb")) { *outColorType = kN32_SkColorType; - *outColorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named); + *outProfileType = kSRGB_SkColorProfileType; return true; } return false; @@ -309,7 +309,7 @@ SkCommandLineConfigGpu* parse_command_line_config_gpu(const SkString& tag, int samples = 0; bool seenColor = false; SkColorType colorType = kN32_SkColorType; - sk_sp colorSpace = nullptr; + SkColorProfileType profileType = kLinear_SkColorProfileType; SkTArray optionParts; SkStrSplit(options.c_str(), ",", kStrict_SkStrSplitMode, &optionParts); @@ -335,7 +335,7 @@ SkCommandLineConfigGpu* parse_command_line_config_gpu(const SkString& tag, valueOk = parse_option_int(value, &samples); seenSamples = true; } else if (key.equals("color") && !seenColor) { - valueOk = parse_option_gpu_color(value, &colorType, &colorSpace); + valueOk = parse_option_gpu_color(value, &colorType, &profileType); seenColor = true; } if (!valueOk) { @@ -343,7 +343,7 @@ SkCommandLineConfigGpu* parse_command_line_config_gpu(const SkString& tag, } } return new SkCommandLineConfigGpu(tag, vias, contextType, useNVPR, useDIText, samples, - colorType, colorSpace); + colorType, profileType); } #endif -- cgit v1.2.3