Mac: Fix bugs in Sierra color fix

ui/accelerated_widget_mac/ca_renderer_layer_tree.mm

 // Copyright 2016 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/accelerated_widget_mac/ca_renderer_layer_tree.h"
 
 #include <AVFoundation/AVFoundation.h>
 #include <CoreMedia/CoreMedia.h>
 #include <CoreVideo/CoreVideo.h>
 #include <GLES2/gl2extchromium.h>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
-#include "base/mac/mac_util.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/trace_event/trace_event.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/cocoa/animation_utils.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/geometry/dip_util.h"
 #include "ui/gl/ca_renderer_layer_params.h"
 #include "ui/gl/gl_image_io_surface.h"
 
 #if !defined(MAC_OS_X_VERSION_10_8) || \
@@ skipping 169 matching lines @@
 }
 
 CARendererLayerTree::SolidColorContents::~SolidColorContents() {
   auto found = map_.Get().find(color_);
   DCHECK(found != map_.Get().end());
   DCHECK(found->second == this);
   map_.Get().erase(color_);
 }
 
 CARendererLayerTree::CARendererLayerTree(
-    bool allow_av_sample_buffer_display_layer)
+    bool allow_av_sample_buffer_display_layer,
+    bool allow_solid_color_layers)
     : allow_av_sample_buffer_display_layer_(
-          allow_av_sample_buffer_display_layer) {}
+          allow_av_sample_buffer_display_layer),
+      allow_solid_color_layers_(allow_solid_color_layers) {}
 CARendererLayerTree::~CARendererLayerTree() {}
 
 bool CARendererLayerTree::ScheduleCALayer(const CARendererLayerParams& params) {
   // Excessive logging to debug white screens (crbug.com/583805).
   // TODO(ccameron): change this back to a DLOG.
   if (has_committed_) {
     LOG(ERROR) << "ScheduleCALayer called after CommitScheduledCALayers.";
     return false;
   }
   return root_layer_.AddContentLayer(this, params);
@@ skipping 63 matching lines @@
         fullscreen_low_power_layer, video_layer->cv_pixel_buffer);
   } else {
     AVSampleBufferDisplayLayerEnqueueIOSurface(fullscreen_low_power_layer,
                                                video_layer->io_surface);
   }
   [fullscreen_low_power_layer setVideoGravity:AVLayerVideoGravityResize];
   [fullscreen_low_power_layer setFrame:video_layer_frame_dip.ToCGRect()];
   return true;
 }
 
+id CARendererLayerTree::ContentsForSolidColorForTesting(SkColor color) {
+  return SolidColorContents::Get(color)->GetContents();
+}
 
 CARendererLayerTree::RootLayer::RootLayer() {}
 
 // Note that for all destructors, the the CALayer will have been reset to nil if
 // another layer has taken it.
 CARendererLayerTree::RootLayer::~RootLayer() {
   [ca_layer removeFromSuperlayer];
 }
 
 CARendererLayerTree::ClipAndSortingLayer::ClipAndSortingLayer(
@@ skipping 59 matching lines @@
       opacity(opacity),
       ca_filter(filter == GL_LINEAR ? kCAFilterLinear : kCAFilterNearest) {
   DCHECK(filter == GL_LINEAR || filter == GL_NEAREST);
 
   // On Mac OS Sierra, solid color layers are not color color corrected to the
   // output monitor color space, but IOSurface-backed layers are color
   // corrected. Note that this is only the case when the CALayers are shared
   // across processes. To make colors consistent across both solid color and
   // IOSurface-backed layers, use a cache of solid-color IOSurfaces as contents.
   // https://crbug.com/633805
-  if (base::mac::IsAtLeastOS10_12()) {

[ccameron, 2016/09/30 22:14:18]

I was testing this on 10.11, so I screwed up this conditional and made us hit
the below lines unconditionally.

+  if (!io_surface && !tree->allow_solid_color_layers_) {
     solid_color_contents = SolidColorContents::Get(background_color);
     ContentLayer::contents_rect = gfx::RectF(0, 0, 1, 1);
   }
 
   // Because the root layer has setGeometryFlipped:YES, there is some ambiguity
   // about what exactly top and bottom mean. This ambiguity is resolved in
   // different ways for solid color CALayers and for CALayers that have content
   // (surprise!). For CALayers with IOSurface content, the top edge in the AA
   // mask refers to what appears as the bottom edge on-screen. For CALayers
   // without content (solid color layers), the top edge in the AA mask is the
@@ skipping 286 matching lines @@
       } else {
         AVSampleBufferDisplayLayerEnqueueIOSurface(av_layer, io_surface);
       }
     }
   } else {
     if (update_contents) {
       if (io_surface) {
         [ca_layer setContents:static_cast<id>(io_surface.get())];
       } else if (solid_color_contents) {
         [ca_layer setContents:solid_color_contents->GetContents()];
+      } else {
+        [ca_layer setContents:nil];
       }
       if ([ca_layer respondsToSelector:(@selector(setContentsScale:))])
         [ca_layer setContentsScale:scale_factor];
     }
     if (update_contents_rect)
       [ca_layer setContentsRect:contents_rect.ToCGRect()];
   }
   if (update_rect) {
     gfx::RectF dip_rect = gfx::RectF(rect);
     dip_rect.Scale(1 / scale_factor);
@@ skipping 22 matching lines @@
 
   static bool show_borders = base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kShowMacOverlayBorders);
   if (show_borders) {
     base::ScopedCFTypeRef<CGColorRef> color;
     if (update_anything) {
       if (use_av_layer) {
         // Yellow represents an AV layer that changed this frame.
         color.reset(CGColorCreateGenericRGB(1, 1, 0, 1));
       } else if (io_surface) {
-        // Pink represents a CALayer that changed this frame.
+        // Magenta represents a CALayer that changed this frame.
         color.reset(CGColorCreateGenericRGB(1, 0, 1, 1));
       } else if (solid_color_contents) {
         // Cyan represents a solid color IOSurface-backed layer.
         color.reset(CGColorCreateGenericRGB(0, 1, 1, 1));
       } else {
         // Red represents a solid color layer.
         color.reset(CGColorCreateGenericRGB(1, 0, 0, 1));
       }
     } else {
       // Grey represents a CALayer that has not changed.
       color.reset(CGColorCreateGenericRGB(0.5, 0.5, 0.5, 1));
     }
     [ca_layer setBorderWidth:1];
     [ca_layer setBorderColor:color];
   }
 }
 
 }  // namespace ui