color: Use ICCProfile from display::Display instead of FromBestMonitor

ui/display/display.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/display/display.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "ui/display/display_switches.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/geometry/size_conversions.h"
+#include "ui/gfx/icc_profile.h"
 
 namespace display {
 namespace {
 
 constexpr int DEFAULT_BITS_PER_PIXEL = 24;
 constexpr int DEFAULT_BITS_PER_COMPONENT = 8;
 
 constexpr int HDR_BITS_PER_PIXEL = 48;
 constexpr int HDR_BITS_PER_COMPONENT = 16;
 
@@ skipping 21 matching lines @@
     if (!base::StringToDouble(value, &scale_in_double)) {
       LOG(ERROR) << "Failed to parse the default device scale factor:" << value;
       scale_in_double = 1.0;
     }
   }
   return static_cast<float>(scale_in_double);
 }
 
 int64_t internal_display_id_ = -1;
 
+gfx::ColorSpace GetForcedColorSpace() {
+  if (gfx::ICCProfile::HasForcedProfile())
+    return gfx::ICCProfile::GetForcedProfile().GetColorSpace();
+  return gfx::ColorSpace::CreateSRGB();
+}
+
 }  // namespace
 
 bool CompareDisplayIds(int64_t id1, int64_t id2) {
   DCHECK_NE(id1, id2);
   // Output index is stored in the first 8 bits. See GetDisplayIdFromEDID
   // in edid_parser.cc.
   int index_1 = id1 & 0xFF;
   int index_2 = id2 & 0xFF;
   DCHECK_NE(index_1, index_2) << id1 << " and " << id2;
   return Display::IsInternalDisplayId(id1) ||
@@ skipping 31 matching lines @@
 
 Display::Display() : Display(kInvalidDisplayId) {}
 
 Display::Display(int64_t id) : Display(id, gfx::Rect()) {}
 
 Display::Display(int64_t id, const gfx::Rect& bounds)
     : id_(id),
       bounds_(bounds),
       work_area_(bounds),
       device_scale_factor_(GetForcedDeviceScaleFactor()),
+      color_space_(GetForcedColorSpace()),
       color_depth_(DEFAULT_BITS_PER_PIXEL),
       depth_per_component_(DEFAULT_BITS_PER_COMPONENT) {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableHDR)) {
     color_depth_ = HDR_BITS_PER_PIXEL;
     depth_per_component_ = HDR_BITS_PER_COMPONENT;
   }
 #if defined(USE_AURA)
   SetScaleAndBounds(device_scale_factor_, bounds);
 #endif
 }
@@ skipping 113 matching lines @@
   DCHECK_NE(kInvalidDisplayId, display_id);
   return HasInternalDisplay() && internal_display_id_ == display_id;
 }
 
 // static
 bool Display::HasInternalDisplay() {
   return internal_display_id_ != kInvalidDisplayId;
 }
 
 }  // namespace display