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

ui/aura/window_tree_host.cc

 // Copyright (c) 2013 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/aura/window_tree_host.h"
 
 #include "base/command_line.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/base/switches.h"
@@ skipping 19 matching lines @@
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/icc_profile.h"
 
 namespace aura {
 
 const char kWindowTreeHostForAcceleratedWidget[] =
     "__AURA_WINDOW_TREE_HOST_ACCELERATED_WIDGET__";
 
-float GetDeviceScaleFactorFromDisplay(Window* window) {
-  return ui::GetScaleFactorForNativeView(window);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHost, public:
 
 WindowTreeHost::~WindowTreeHost() {
   DCHECK(!compositor_) << "compositor must be destroyed before root window";
   if (owned_input_method_) {
     delete input_method_;
     input_method_ = nullptr;
   }
 }
@@ skipping 217 matching lines @@
       base::ThreadTaskRunnerHandle::Get(), enable_surface_synchronization));
   if (!dispatcher()) {
     window()->Init(ui::LAYER_NOT_DRAWN);
     window()->set_host(this);
     window()->SetName("RootWindow");
     dispatcher_.reset(new WindowEventDispatcher(this));
   }
 }
 
 void WindowTreeHost::InitCompositor() {
-  compositor_->SetScaleAndSize(GetDeviceScaleFactorFromDisplay(window()),
+  display::Display display =
+      display::Screen::GetScreen()->GetDisplayNearestWindow(window());
+  compositor_->SetScaleAndSize(display.device_scale_factor(),
                                GetBoundsInPixels().size());
   compositor_->SetRootLayer(window()->layer());
-  compositor_->SetDisplayColorProfile(GetICCProfileForCurrentDisplay());
+  compositor_->SetDisplayColorSpace(display.color_space());
 }
 
 void WindowTreeHost::OnAcceleratedWidgetAvailable() {
   compositor_->SetAcceleratedWidget(GetAcceleratedWidget());
   prop_.reset(new ui::ViewProp(GetAcceleratedWidget(),
                                kWindowTreeHostForAcceleratedWidget, this));
 }
 
 void WindowTreeHost::OnHostMovedInPixels(
     const gfx::Point& new_location_in_pixels) {
   TRACE_EVENT1("ui", "WindowTreeHost::OnHostMovedInPixels", "origin",
                new_location_in_pixels.ToString());
 
   for (WindowTreeHostObserver& observer : observers_)
     observer.OnHostMovedInPixels(this, new_location_in_pixels);
 }
 
 void WindowTreeHost::OnHostResizedInPixels(
     const gfx::Size& new_size_in_pixels) {
   gfx::Size adjusted_size(new_size_in_pixels);
   adjusted_size.Enlarge(output_surface_padding_in_pixels_.width(),
                         output_surface_padding_in_pixels_.height());
   // The compositor should have the same size as the native root window host.
   // Get the latest scale from display because it might have been changed.
-  compositor_->SetScaleAndSize(GetDeviceScaleFactorFromDisplay(window()),
+  compositor_->SetScaleAndSize(ui::GetScaleFactorForNativeView(window()),
                                adjusted_size);
 
   gfx::Size layer_size = GetBoundsInPixels().size();
   // The layer, and the observers should be notified of the
   // transformed size of the root window.
   UpdateRootWindowSizeInPixels(layer_size);
   for (WindowTreeHostObserver& observer : observers_)
     observer.OnHostResized(this);
 }
 
@@ skipping 10 matching lines @@
 void WindowTreeHost::OnHostActivated() {
   Env::GetInstance()->NotifyHostActivated(this);
 }
 
 void WindowTreeHost::OnHostLostWindowCapture() {
   Window* capture_window = client::GetCaptureWindow(window());
   if (capture_window && capture_window->GetRootWindow() == window())
     capture_window->ReleaseCapture();
 }
 
-gfx::ICCProfile WindowTreeHost::GetICCProfileForCurrentDisplay() {
-  // TODO(hubbe): Get the color space from the *current* monitor and
-  // update it when window is moved or color space configuration changes.
-  return gfx::ICCProfile::FromBestMonitor();
-}
-
 ui::EventSink* WindowTreeHost::GetEventSink() {
   return dispatcher_.get();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHost, private:
 
 void WindowTreeHost::MoveCursorToInternal(const gfx::Point& root_location,
                                           const gfx::Point& host_location) {
   last_cursor_request_position_in_host_ = host_location;
   MoveCursorToScreenLocationInPixels(host_location);
   client::CursorClient* cursor_client = client::GetCursorClient(window());
   if (cursor_client) {
     const display::Display& display =
         display::Screen::GetScreen()->GetDisplayNearestWindow(window());
     cursor_client->SetDisplay(display);
   }
   dispatcher()->OnCursorMovedToRootLocation(root_location);
 }
 
 }  // namespace aura