Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(901)

Unified Diff: tools/flags/SkCommonFlagsConfig.cpp

Issue 2069173002: Lots of progress switching to SkColorSpace rather than SkColorProfileType (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Fix bad assert Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/flags/SkCommonFlagsConfig.h ('k') | tools/picture_utils.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/flags/SkCommonFlagsConfig.cpp
diff --git a/tools/flags/SkCommonFlagsConfig.cpp b/tools/flags/SkCommonFlagsConfig.cpp
index 1c7920eb551df323fbec67955078a4ad6f0f4734..d5c7a1d5bf2b7af10f02bff596d64e8cef6509b5 100644
--- a/tools/flags/SkCommonFlagsConfig.cpp
+++ b/tools/flags/SkCommonFlagsConfig.cpp
@@ -192,14 +192,14 @@ SkCommandLineConfig::~SkCommandLineConfig() {
SkCommandLineConfigGpu::SkCommandLineConfigGpu(
const SkString& tag, const SkTArray<SkString>& viaParts,
ContextType contextType, bool useNVPR, bool useDIText, int samples,
- SkColorType colorType, SkColorProfileType profileType)
+ SkColorType colorType, sk_sp<SkColorSpace> colorSpace)
: SkCommandLineConfig(tag, SkString("gpu"), viaParts)
, fContextType(contextType)
, fUseNVPR(useNVPR)
, fUseDIText(useDIText)
, fSamples(samples)
, fColorType(colorType)
- , fProfileType(profileType) {
+ , fColorSpace(std::move(colorSpace)) {
}
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,
- SkColorProfileType* outProfileType) {
+ sk_sp<SkColorSpace>* outColorSpace) {
if (value.equals("8888")) {
*outColorType = kN32_SkColorType;
- *outProfileType = kLinear_SkColorProfileType;
+ *outColorSpace = nullptr;
return true;
}
if (value.equals("f16")) {
*outColorType = kRGBA_F16_SkColorType;
- *outProfileType = kLinear_SkColorProfileType;
+ *outColorSpace = nullptr;
return true;
}
if (value.equals("srgb")) {
*outColorType = kN32_SkColorType;
- *outProfileType = kSRGB_SkColorProfileType;
+ *outColorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);
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;
- SkColorProfileType profileType = kLinear_SkColorProfileType;
+ sk_sp<SkColorSpace> colorSpace = nullptr;
SkTArray<SkString> 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, &profileType);
+ valueOk = parse_option_gpu_color(value, &colorType, &colorSpace);
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, profileType);
+ colorType, colorSpace);
}
#endif
« no previous file with comments | « tools/flags/SkCommonFlagsConfig.h ('k') | tools/picture_utils.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698