Chromium Code Reviews| Index: content/shell/app/shell_main_delegate.cc |
| diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc |
| index f496af7313ade6096dea3592b6f5ee883fdc686d..e3a3954958665e530e27154c16cfe1bbbf215b90 100644 |
| --- a/content/shell/app/shell_main_delegate.cc |
| +++ b/content/shell/app/shell_main_delegate.cc |
| @@ -213,9 +213,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) { |
| command_line.AppendSwitch(switches::kDisableGpuRasterization); |
| } |
| - // Enable color correct rendering. If the virtual test suite didn't specify |
| - // a color space, then use sRGB. |
| - command_line.AppendSwitch(switches::kEnableColorCorrectRendering); |
| + // If the virtual test suite didn't specify a color space, then force sRGB. |
| if (!command_line.HasSwitch(switches::kForceColorProfile)) |
| command_line.AppendSwitchASCII(switches::kForceColorProfile, "srgb"); |
| @@ -236,6 +234,13 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) { |
| } |
| } |
|
ccameron
2017/06/15 20:23:55
This is doing what was explicitly not supposed to
Alexei Svitkine (slow)
2017/06/15 21:04:40
(Just trying to understand.)
Is the goal to enabl
ccameron
2017/06/15 21:26:25
(related oops -- this was supposed to be in the "i
|
| + // Enable additional base::Features. Note that there already may exist a list |
| + // of enabled features from the virtual or physical test suite. |
| + std::string enabled_features = |
| + command_line.GetSwitchValueASCII(switches::kEnableFeatures); |
| + enabled_features = "ColorCorrectRendering," + enabled_features; |
| + command_line.AppendSwitchASCII(switches::kEnableFeatures, enabled_features); |
| + |
| content_client_.reset(base::CommandLine::ForCurrentProcess()->HasSwitch( |
| switches::kRunLayoutTest) |
| ? new LayoutTestContentClient |