Communicate color space to ui::Compositor

We don't send the color space to the browser's ui::Compositor on macOS.
This has been broken on macOS for an unknown period of time. It didn't
actually make a difference because
- that only set the raster space for browser UI, which is sRGB anyway
- the renderer got the correct color space for raster via
  RenderWidgetHostImpl::GetScreenInfo
- we would draw using CoreAnimation (not GLRenderer) >99.9% of the
  time, so the ui::Compositor's GLRenderer's color space didn't matter
Because of rounded corner rects, we hit the GLRenderer more often,
causing this bug be visible.

Change RecyclableCompositorMac::UpdateSurface to take a required
color space argument, ensuring that all callers specify a value.

Bug: 1038723
Change-Id: Icde934718371802356c5c26277a628361705009f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1985127Reviewed-by: Eric Karl <ericrk@chromium.org>
Commit-Queue: ccameron <ccameron@chromium.org>
Cr-Commit-Position: refs/heads/master@{#728067}

content/browser/renderer_host/browser_compositor_view_mac.mm

@@ -152,10 +152,9 @@ bool BrowserCompositorMac::UpdateSurfaceFromNSView(
   }
 
   if (recyclable_compositor_) {
-    recyclable_compositor_->compositor()->SetDisplayColorSpace(
-        dfh_display_.color_space());
     recyclable_compositor_->UpdateSurface(dfh_size_pixels_,
-                                          dfh_display_.device_scale_factor());
+                                          dfh_display_.device_scale_factor(),
+                                          dfh_display_.color_space());
   }
 
   return true;
@@ -174,7 +173,8 @@ void BrowserCompositorMac::UpdateSurfaceFromChild(
     root_layer_->SetBounds(gfx::Rect(dfh_size_dip_));
     if (recyclable_compositor_) {
       recyclable_compositor_->UpdateSurface(dfh_size_pixels_,
-                                            dfh_display_.device_scale_factor());
+                                            dfh_display_.device_scale_factor(),
+                                            dfh_display_.color_space());
     }
     delegated_frame_host_->EmbedSurface(
         dfh_local_surface_id_allocator_.GetCurrentLocalSurfaceIdAllocation()
@@ -278,11 +278,10 @@ void BrowserCompositorMac::TransitionToState(State new_state) {
         ui::RecyclableCompositorMacFactory::Get()->CreateCompositor(
             content::GetContextFactory(), content::GetContextFactoryPrivate());
     recyclable_compositor_->UpdateSurface(dfh_size_pixels_,
-                                          dfh_display_.device_scale_factor());
+                                          dfh_display_.device_scale_factor(),
+                                          dfh_display_.color_space());
     recyclable_compositor_->compositor()->SetRootLayer(root_layer_.get());
     recyclable_compositor_->compositor()->SetBackgroundColor(background_color_);
-    recyclable_compositor_->compositor()->SetDisplayColorSpace(
-        dfh_display_.color_space());
     recyclable_compositor_->widget()->SetNSView(
         accelerated_widget_mac_ns_view_);
     recyclable_compositor_->Unsuspend();

ui/compositor/recyclable_compositor_mac.cc

@@ -67,8 +67,10 @@ void RecyclableCompositorMac::Unsuspend() {
   compositor_suspended_lock_ = nullptr;
 }
 
-void RecyclableCompositorMac::UpdateSurface(const gfx::Size& size_pixels,
-                                            float scale_factor) {
+void RecyclableCompositorMac::UpdateSurface(
+    const gfx::Size& size_pixels,
+    float scale_factor,
+    const gfx::ColorSpace& color_space) {
   if (size_pixels != size_pixels_ || scale_factor != scale_factor_) {
     size_pixels_ = size_pixels;
     scale_factor_ = scale_factor;
@@ -78,15 +80,21 @@ void RecyclableCompositorMac::UpdateSurface(const gfx::Size& size_pixels,
     compositor()->SetScaleAndSize(scale_factor_, size_pixels_,
                                   local_surface_id_allocation);
   }
+  if (color_space != color_space_) {
+    color_space_ = color_space;
+    compositor()->SetDisplayColorSpace(color_space_);
+  }
 }
 
 void RecyclableCompositorMac::InvalidateSurface() {
   size_pixels_ = gfx::Size();
   scale_factor_ = 1.f;
   local_surface_id_allocator_.Invalidate();
+  color_space_ = gfx::ColorSpace();
   compositor()->SetScaleAndSize(
       scale_factor_, size_pixels_,
       local_surface_id_allocator_.GetCurrentLocalSurfaceIdAllocation());
+  compositor()->SetDisplayColorSpace(color_space_);
 }
 
 void RecyclableCompositorMac::OnCompositingDidCommit(

ui/compositor/recyclable_compositor_mac.h

@@ -41,22 +41,25 @@ class COMPOSITOR_EXPORT RecyclableCompositorMac
   void Unsuspend();
 
   // Update the compositor's surface information, if needed.
-  void UpdateSurface(const gfx::Size& size_pixels, float scale_factor);
+  void UpdateSurface(const gfx::Size& size_pixels,
+                     float scale_factor,
+                     const gfx::ColorSpace& color_space);
   // Invalidate the compositor's surface information.
   void InvalidateSurface();
 
-  // The viz::ParentLocalSurfaceIdAllocator for the ui::Compositor dispenses
-  // viz::LocalSurfaceIds that are renderered into by the ui::Compositor.
-  viz::ParentLocalSurfaceIdAllocator local_surface_id_allocator_;
-  gfx::Size size_pixels_;
-  float scale_factor_ = 1.f;
-
  private:
   friend class RecyclableCompositorMacFactory;
 
   // ui::CompositorObserver implementation:
   void OnCompositingDidCommit(ui::Compositor* compositor) override;
 
+  // The viz::ParentLocalSurfaceIdAllocator for the ui::Compositor dispenses
+  // viz::LocalSurfaceIds that are renderered into by the ui::Compositor.
+  viz::ParentLocalSurfaceIdAllocator local_surface_id_allocator_;
+  gfx::Size size_pixels_;
+  float scale_factor_ = 1.f;
+  gfx::ColorSpace color_space_;
+
   std::unique_ptr<ui::AcceleratedWidgetMac> accelerated_widget_mac_;
   ui::Compositor compositor_;
   std::unique_ptr<ui::CompositorLock> compositor_suspended_lock_;

ui/views/cocoa/native_widget_mac_ns_window_host.mm

@@ -529,7 +529,7 @@ void NativeWidgetMacNSWindowHost::UpdateCompositorProperties() {
   layer()->SetBounds(gfx::Rect(surface_size_in_dip));
   compositor_->UpdateSurface(
       ConvertSizeToPixel(display_.device_scale_factor(), surface_size_in_dip),
-      display_.device_scale_factor());
+      display_.device_scale_factor(), display_.color_space());
 }
 
 void NativeWidgetMacNSWindowHost::DestroyCompositor() {
@@ -989,7 +989,7 @@ void NativeWidgetMacNSWindowHost::OnWindowDisplayChanged(
     compositor_->UpdateSurface(
         ConvertSizeToPixel(display_.device_scale_factor(),
                            content_bounds_in_screen_.size()),
-        display_.device_scale_factor());
+        display_.device_scale_factor(), display_.color_space());
   }
   if (display_id_changed) {
     display_link_ = ui::DisplayLinkMac::GetForDisplay(display_.id());