[CI] Adding a force-raster-color-profile flag, to get OOPIF mode tests to pass

With this change, there are now two color-profile related switches:
 --force-color-profile - forces the DISPLAY color profile to the desired setting.
                         Note that the name of the flag didn't change, for
                         backwards-compatibility. But it now refers to the
                         display surface only.
 --force-raster-color-profile - forces the rasterization to happen in the
                                provided color space.

The exotic-color-space virtual test suite now sets the raster color profile to
the ColorSpin profile, and the display color profile to sRGB. All other tests
(by default) set both color profiles to sRGB.


Bug: 875942, 667551
Change-Id: I66445cea5ed8dcc259a8f0bda2141350bcf66458
Reviewed-on: https://chromium-review.googlesource.com/1205713
Commit-Queue: Mason Freed <masonfreed@chromium.org>
Reviewed-by: ccameron <ccameron@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#589948}

chrome/browser/about_flags.cc

@@ -802,14 +802,14 @@ const FeatureEntry::Choice kEnableAudioFocusChoices[] = {
 
 const FeatureEntry::Choice kForceColorProfileChoices[] = {
     {flags_ui::kGenericExperimentChoiceDefault, "", ""},
-    {flag_descriptions::kForceColorProfileSRGB, switches::kForceColorProfile,
-     "srgb"},
-    {flag_descriptions::kForceColorProfileP3, switches::kForceColorProfile,
-     "display-p3-d65"},
+    {flag_descriptions::kForceColorProfileSRGB,
+     switches::kForceDisplayColorProfile, "srgb"},
+    {flag_descriptions::kForceColorProfileP3,
+     switches::kForceDisplayColorProfile, "display-p3-d65"},
     {flag_descriptions::kForceColorProfileColorSpin,
-     switches::kForceColorProfile, "color-spin-gamma24"},
-    {flag_descriptions::kForceColorProfileHdr, switches::kForceColorProfile,
-     "scrgb-linear"},
+     switches::kForceDisplayColorProfile, "color-spin-gamma24"},
+    {flag_descriptions::kForceColorProfileHdr,
+     switches::kForceDisplayColorProfile, "scrgb-linear"},
 };
 
 const FeatureEntry::FeatureParam kAutofillPreviewStyleBlackOnBlue050[] = {

chrome/test/base/in_process_browser_test.cc

@@ -260,7 +260,7 @@ void InProcessBrowserTest::SetUpDefaultCommandLine(
 
   // Use an sRGB color profile to ensure that the machine's color profile does
   // not affect the results.
-  command_line->AppendSwitchASCII(switches::kForceColorProfile, "srgb");
+  command_line->AppendSwitchASCII(switches::kForceDisplayColorProfile, "srgb");
 
   // TODO(pkotwicz): Investigate if we can remove this switch.
   if (exit_when_last_browser_closes_)

content/browser/renderer_host/render_process_host_impl.cc

@@ -2999,7 +2999,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
     switches::kEnableWebVR,
     switches::kExplicitlyAllowedPorts,
     switches::kFileUrlPathAlias,
-    switches::kForceColorProfile,
+    switches::kForceDisplayColorProfile,
     switches::kForceDeviceScaleFactor,
     switches::kForceGpuMemAvailableMb,
     switches::kForceGpuRasterization,

content/browser/renderer_host/render_widget_host_impl.cc

@@ -1602,6 +1602,9 @@ void RenderWidgetHostImpl::GetScreenInfo(ScreenInfo* result) {
   else
     DisplayUtil::GetDefaultScreenInfo(result);
 
+  if (display::Display::HasForceRasterColorProfile())
+    result->color_space = display::Display::GetForcedRasterColorProfile();
+
   // TODO(sievers): find a way to make this done another way so the method
   // can be const.
   if (IsUseZoomForDSFEnabled())

content/public/test/browser_test_base.cc

@@ -245,7 +245,7 @@ void BrowserTestBase::SetUp() {
 
   // Use an sRGB color profile to ensure that the machine's color profile does
   // not affect the results.
-  command_line->AppendSwitchASCII(switches::kForceColorProfile, "srgb");
+  command_line->AppendSwitchASCII(switches::kForceDisplayColorProfile, "srgb");
 
   // Disable compositor Ukm in browser tests until crbug.com/761524 is resolved.
   command_line->AppendSwitch(switches::kDisableCompositorUkmForTests);

content/shell/app/shell_main_delegate.cc

@@ -266,9 +266,12 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
       command_line.AppendSwitch(switches::kDisableGpuRasterization);
     }
 
-    // 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");
+    // If the virtual test suite didn't specify a display color space, then
+    // force sRGB.
+    if (!command_line.HasSwitch(switches::kForceDisplayColorProfile)) {
+      command_line.AppendSwitchASCII(switches::kForceDisplayColorProfile,
+                                     "srgb");
+    }
 
     // We want stable/baseline results when running layout tests.
     command_line.AppendSwitch(switches::kDisableSkiaRuntimeOpts);

content/test/layouttest_support.cc

@@ -501,7 +501,7 @@ gfx::ColorSpace GetTestingColorSpace(const std::string& name) {
   } else if (name == "adobeRGB") {
     return gfx::ICCProfileForTestingAdobeRGB().GetColorSpace();
   } else if (name == "reset") {
-    return display::Display::GetForcedColorProfile();
+    return display::Display::GetForcedDisplayColorProfile();
   }
   return gfx::ColorSpace();
 }

third_party/WebKit/LayoutTests/VirtualTestSuites

@@ -105,7 +105,8 @@
   {
     "prefix": "exotic-color-space",
     "base": "images",
-    "args": ["--force-color-profile=color-spin-gamma24"]
+    "args": ["--force-color-profile=srgb",
+             "--force-raster-color-profile=color-spin-gamma24"]
   },
   {
     "prefix": "stable",

ui/android/display_android_manager.cc

@@ -89,7 +89,7 @@ void DisplayAndroidManager::UpdateDisplay(
   display::Display display(sdkDisplayId, bounds_in_dip);
   if (!Display::HasForceDeviceScaleFactor())
     display.set_device_scale_factor(dipScale);
-  if (!Display::HasForceColorProfile()) {
+  if (!Display::HasForceDisplayColorProfile()) {
     // TODO(ccameron): Use CreateDisplayP3D65 if isWideColorGamut is true, once
     // the feature is ready to use.
     display.set_color_space(gfx::ColorSpace::CreateSRGB());

ui/display/display.cc

@@ -58,6 +58,33 @@ float GetForcedDeviceScaleFactorImpl() {
 
 int64_t internal_display_id_ = -1;
 
+gfx::ColorSpace ForcedColorProfileStringToColorSpace(const std::string& value) {
+  if (value == "srgb")
+    return gfx::ColorSpace::CreateSRGB();
+  if (value == "display-p3-d65")
+    return gfx::ColorSpace::CreateDisplayP3D65();
+  if (value == "scrgb-linear")
+    return gfx::ColorSpace::CreateSCRGBLinear();
+  if (value == "extended-srgb")
+    return gfx::ColorSpace::CreateExtendedSRGB();
+  if (value == "generic-rgb") {
+    return gfx::ColorSpace(gfx::ColorSpace::PrimaryID::APPLE_GENERIC_RGB,
+                           gfx::ColorSpace::TransferID::GAMMA18);
+  }
+  if (value == "color-spin-gamma24") {
+    // Run this color profile through an ICC profile. The resulting color space
+    // is slightly different from the input color space, and removing the ICC
+    // profile would require rebaselineing many layout tests.
+    gfx::ColorSpace color_space(
+        gfx::ColorSpace::PrimaryID::WIDE_GAMUT_COLOR_SPIN,
+        gfx::ColorSpace::TransferID::GAMMA24);
+    return gfx::ICCProfile::FromParametricColorSpace(color_space)
+        .GetColorSpace();
+  }
+  LOG(ERROR) << "Invalid forced color profile: \"" << value << "\"";
+  return gfx::ColorSpace::CreateSRGB();
+}
+
 }  // namespace
 
 bool CompareDisplayIds(int64_t id1, int64_t id2) {
@@ -103,42 +130,33 @@ void Display::SetForceDeviceScaleFactor(double dsf) {
 }
 
 // static
-gfx::ColorSpace Display::GetForcedColorProfile() {
-  DCHECK(HasForceColorProfile());
+gfx::ColorSpace Display::GetForcedDisplayColorProfile() {
+  DCHECK(HasForceDisplayColorProfile());
   std::string value =
       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-          switches::kForceColorProfile);
-  if (value == "srgb") {
-    return gfx::ColorSpace::CreateSRGB();
-  } else if (value == "display-p3-d65") {
-    return gfx::ColorSpace::CreateDisplayP3D65();
-  } else if (value == "scrgb-linear") {
-    return gfx::ColorSpace::CreateSCRGBLinear();
-  } else if (value == "extended-srgb") {
-    return gfx::ColorSpace::CreateExtendedSRGB();
-  } else if (value == "generic-rgb") {
-    return gfx::ColorSpace(gfx::ColorSpace::PrimaryID::APPLE_GENERIC_RGB,
-                           gfx::ColorSpace::TransferID::GAMMA18);
-  } else if (value == "color-spin-gamma24") {
-    // Run this color profile through an ICC profile. The resulting color space
-    // is slightly different from the input color space, and removing the ICC
-    // profile would require rebaselineing many layout tests.
-    gfx::ColorSpace color_space(
-        gfx::ColorSpace::PrimaryID::WIDE_GAMUT_COLOR_SPIN,
-        gfx::ColorSpace::TransferID::GAMMA24);
-    return gfx::ICCProfile::FromParametricColorSpace(color_space)
-        .GetColorSpace();
-  }
-  LOG(ERROR) << "Invalid forced color profile";
-  return gfx::ColorSpace::CreateSRGB();
+          switches::kForceDisplayColorProfile);
+  return ForcedColorProfileStringToColorSpace(value);
 }
 
 // static
-bool Display::HasForceColorProfile() {
-  static bool has_force_color_profile =
-      base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kForceColorProfile);
-  return has_force_color_profile;
+bool Display::HasForceDisplayColorProfile() {
+  return base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kForceDisplayColorProfile);
+}
+
+// static
+gfx::ColorSpace Display::GetForcedRasterColorProfile() {
+  DCHECK(HasForceRasterColorProfile());
+  std::string value =
+      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+          switches::kForceRasterColorProfile);
+  return ForcedColorProfileStringToColorSpace(value);
+}
+
+// static
+bool Display::HasForceRasterColorProfile() {
+  return base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kForceRasterColorProfile);
 }
 
 // static
@@ -196,8 +214,8 @@ Display::Display(int64_t id, const gfx::Rect& bounds)
       color_space_(gfx::ColorSpace::CreateSRGB()),
       color_depth_(DEFAULT_BITS_PER_PIXEL),
       depth_per_component_(DEFAULT_BITS_PER_COMPONENT) {
-  if (HasForceColorProfile())
-    SetColorSpaceAndDepth(GetForcedColorProfile());
+  if (HasForceDisplayColorProfile())
+    SetColorSpaceAndDepth(GetForcedDisplayColorProfile());
 #if defined(USE_AURA)
   SetScaleAndBounds(device_scale_factor_, bounds);
 #endif

ui/display/display.h

@@ -94,11 +94,19 @@ class DISPLAY_EXPORT Display final {
 
   // Returns the forced display color profile, which is given by
   // "--force-color-profile".
-  static gfx::ColorSpace GetForcedColorProfile();
+  static gfx::ColorSpace GetForcedDisplayColorProfile();
 
   // Indicates if a display color profile is being explicitly enforced from the
   // command line via "--force-color-profile".
-  static bool HasForceColorProfile();
+  static bool HasForceDisplayColorProfile();
+
+  // Returns the forced raster color profile, which is given by
+  // "--force-raster-color-profile".
+  static gfx::ColorSpace GetForcedRasterColorProfile();
+
+  // Indicates if a raster color profile is being explicitly enforced from the
+  // command line via "--force-raster-color-profile".
+  static bool HasForceRasterColorProfile();
 
   // Indicates if the display color profile being forced should be ensured to
   // be in use by the operating system as well.

ui/display/display_switches.cc

@@ -25,7 +25,11 @@ const char kEnsureForcedColorProfile[] = "ensure-forced-color-profile";
 // Force all monitors to be treated as though they have the specified color
 // profile. Accepted values are "srgb" and "generic-rgb" (currently used by Mac
 // layout tests) and "color-spin-gamma24" (used by layout tests).
-const char kForceColorProfile[] = "force-color-profile";
+const char kForceDisplayColorProfile[] = "force-color-profile";
+
+// Force rastering to take place in the specified color profile. Accepted values
+// are the same as for the kForceDisplayColorProfile case above.
+const char kForceRasterColorProfile[] = "force-raster-color-profile";
 
 // Overrides the device scale factor for the browser UI and the contents.
 const char kForceDeviceScaleFactor[] = "force-device-scale-factor";

ui/display/display_switches.h

@@ -16,8 +16,9 @@ namespace switches {
 DISPLAY_EXPORT extern const char kDisableMultiMirroring[];
 DISPLAY_EXPORT extern const char kEnableSoftwareMirroring[];
 DISPLAY_EXPORT extern const char kEnsureForcedColorProfile[];
-DISPLAY_EXPORT extern const char kForceColorProfile[];
 DISPLAY_EXPORT extern const char kForceDeviceScaleFactor[];
+DISPLAY_EXPORT extern const char kForceDisplayColorProfile[];
+DISPLAY_EXPORT extern const char kForceRasterColorProfile[];
 // TODO(kylechar): This overlaps with --screen-config. Unify flags and remove.
 DISPLAY_EXPORT extern const char kHostWindowBounds[];
 DISPLAY_EXPORT extern const char kScreenConfig[];

ui/display/mac/screen_mac.mm

@@ -93,7 +93,7 @@ Display BuildDisplayForScreen(NSScreen* screen) {
   }
   icc_profile.HistogramDisplay(display.id());
   gfx::ColorSpace screen_color_space = icc_profile.GetColorSpace();
-  if (Display::HasForceColorProfile()) {
+  if (Display::HasForceDisplayColorProfile()) {
     if (Display::HasEnsureForcedColorProfile()) {
       CHECK_EQ(screen_color_space, display.color_space())
           << "The display's color space does not match the color space that "

ui/display/win/screen_win.cc

@@ -153,7 +153,7 @@ Display CreateDisplayFromDisplayInfo(const DisplayInfo& display_info,
   display.set_bounds(gfx::ScaleToEnclosingRect(display_info.screen_rect(),
                      1.0f / scale_factor));
   display.set_rotation(display_info.rotation());
-  if (!Display::HasForceColorProfile()) {
+  if (!Display::HasForceDisplayColorProfile()) {
     if (hdr_enabled) {
       display.SetColorSpaceAndDepth(
           gfx::ColorSpace::CreateSCRGBLinear().GetScaledColorSpace(

ui/views/widget/desktop_aura/desktop_screen_x11.cc

@@ -450,7 +450,7 @@ std::vector<display::Display> DesktopScreenX11::BuildDisplaysFromXRandRInfo() {
       if (monitor_iter != output_to_monitor.end() && monitor_iter->second == 0)
         monitor_order_primary_display_index = displays.size();
 
-      if (!display::Display::HasForceColorProfile()) {
+      if (!display::Display::HasForceDisplayColorProfile()) {
         gfx::ICCProfile icc_profile = GetICCProfileForMonitor(
             monitor_iter == output_to_monitor.end() ? 0 : monitor_iter->second);
         icc_profile.HistogramDisplay(display.id());