color: Ensure window tree host gets updates

This logic was incorrectly inverted.

Bug: 735613
Change-Id: Ib07302612c02e860c006f0cc2e9929a04f5de009
Reviewed-on: https://chromium-review.googlesource.com/596710
Commit-Queue: ccameron chromium <ccameron@chromium.org>
Reviewed-by: Fredrik Hubinette <hubbe@chromium.org>
Cr-Commit-Position: refs/heads/master@{#491655}

ui/aura/test/test_screen.cc

@@ -68,6 +68,12 @@ void TestScreen::SetDeviceScaleFactor(float device_scale_factor) {
   host_->OnHostResizedInPixels(bounds_in_pixel.size());
 }
 
+void TestScreen::SetColorSpace(const gfx::ColorSpace& color_space) {
+  display::Display display(GetPrimaryDisplay());
+  display.set_color_space(color_space);
+  display_list().UpdateDisplay(display);
+}
+
 void TestScreen::SetDisplayRotation(display::Display::Rotation rotation) {
   display::Display display(GetPrimaryDisplay());
   gfx::Rect bounds_in_pixel(display.GetSizeInPixel());

ui/aura/test/test_screen.h

@@ -12,6 +12,7 @@
 #include "ui/display/screen_base.h"
 
 namespace gfx {
+class ColorSpace;
 class Insets;
 class Rect;
 class Transform;
@@ -35,6 +36,7 @@ class TestScreen : public display::ScreenBase, public WindowObserver {
   WindowTreeHost* CreateHostForPrimaryDisplay();
 
   void SetDeviceScaleFactor(float device_scale_fator);
+  void SetColorSpace(const gfx::ColorSpace& color_space);
   void SetDisplayRotation(display::Display::Rotation rotation);
   void SetUIScale(float ui_scale);
   void SetWorkAreaInsets(const gfx::Insets& insets);

ui/aura/window_tree_host.cc

@@ -356,7 +356,7 @@ void WindowTreeHost::OnDisplayMetricsChanged(const display::Display& display,
   if (metrics & DisplayObserver::DISPLAY_METRIC_COLOR_SPACE) {
     display::Screen* screen = display::Screen::GetScreen();
     if (compositor_ &&
-        display.id() != screen->GetDisplayNearestView(window()).id()) {
+        display.id() == screen->GetDisplayNearestView(window()).id()) {
       compositor_->SetDisplayColorSpace(display.color_space());
     }
   }

ui/aura/window_tree_host_unittest.cc

@@ -86,4 +86,12 @@ TEST_F(WindowTreeHostTest, NoRewritesPostIME) {
   host()->RemoveEventRewriter(&event_rewriter);
 }
 
+TEST_F(WindowTreeHostTest, ColorSpace) {
+  EXPECT_EQ(gfx::ColorSpace::CreateSRGB(),
+            host()->compositor()->output_color_space());
+  test_screen()->SetColorSpace(gfx::ColorSpace::CreateSCRGBLinear());
+  EXPECT_EQ(gfx::ColorSpace::CreateSCRGBLinear(),
+            host()->compositor()->output_color_space());
+}
+
 }  // namespace aura

ui/compositor/compositor.h

@@ -234,6 +234,11 @@ class COMPOSITOR_EXPORT Compositor
   // compositing layers on.
   float device_scale_factor() const { return device_scale_factor_; }
 
+  // The color space of the device that this compositor is being displayed on.
+  const gfx::ColorSpace& output_color_space() const {
+    return output_color_space_;
+  }
+
   // Where possible, draws are scissored to a damage region calculated from
   // changes to layer properties.  This bypasses that and indicates that
   // the whole frame needs to be drawn.