viz/mac: Add plumbing for GL rendering on mac

Plumb the flag --disable-mac-overlays.

Update CALayer parameters to make the IOSurfaces CAContextID mutually
exclusive (otherwise we get warned that the IOSurface mach port is
invalid, when it is expected to be invalid).

R=dcheng, fsamuel
TBR=avi (content/)

Bug: 772576
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel
Change-Id: Iaa2f2fdfb6dbb4135bd989f4c2af1ab6be892a1a
Reviewed-on: https://chromium-review.googlesource.com/882316
Commit-Queue: ccameron <ccameron@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Fady Samuel <fsamuel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#532269}

components/viz/common/display/renderer_settings.h

@@ -30,6 +30,7 @@ class VIZ_COMMON_EXPORT RendererSettings {
   bool show_overdraw_feedback = false;
   bool enable_draw_occlusion = false;
   bool use_skia_renderer = false;
+  bool allow_overlays = true;
   bool dont_round_texture_sizes_for_pixel_tests = false;
   int highp_threshold_min = 0;
 

components/viz/host/renderer_settings_creation.cc

@@ -11,6 +11,10 @@
 #include "components/viz/common/display/renderer_settings.h"
 #include "ui/base/ui_base_switches.h"
 
+#if defined(OS_MACOSX)
+#include "ui/base/cocoa/remote_layer_api.h"
+#endif
+
 namespace viz {
 
 namespace {
@@ -59,6 +63,12 @@ RendererSettings CreateRendererSettings() {
       !command_line->HasSwitch(switches::kDisableCompositedAntialiasing);
   renderer_settings.use_skia_renderer =
       command_line->HasSwitch(switches::kUseSkiaRenderer);
+#if defined(OS_MACOSX)
+  renderer_settings.allow_overlays =
+      ui::RemoteLayerAPISupported() &&
+      !base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableMacOverlays);
+#endif
   if (command_line->HasSwitch(switches::kSlowDownCompositingScaleFactor)) {
     const int kMinSlowDownScaleFactor = 1;
     const int kMaxSlowDownScaleFactor = 1000;

components/viz/service/display_embedder/gl_output_surface_mac.cc

@@ -8,16 +8,12 @@
 
 namespace viz {
 
-namespace {
-// TODO(ccameron): Plumb this appropriately.
-const bool kDisableRemoteCoreAnimation = false;
-}  // namespace
-
 GLOutputSurfaceMac::GLOutputSurfaceMac(
     scoped_refptr<InProcessContextProvider> context_provider,
     gpu::SurfaceHandle surface_handle,
     SyntheticBeginFrameSource* synthetic_begin_frame_source,
-    gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager)
+    gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
+    bool allow_overlays)
     : GLOutputSurfaceBufferQueue(context_provider,
                                  surface_handle,
                                  synthetic_begin_frame_source,
@@ -25,8 +21,8 @@ GLOutputSurfaceMac::GLOutputSurfaceMac(
                                  GL_TEXTURE_RECTANGLE_ARB,
                                  GL_RGBA,
                                  gfx::BufferFormat::RGBA_8888),
-      overlay_validator_(new CompositorOverlayCandidateValidatorMac(
-          kDisableRemoteCoreAnimation)) {}
+      overlay_validator_(
+          new CompositorOverlayCandidateValidatorMac(!allow_overlays)) {}
 
 GLOutputSurfaceMac::~GLOutputSurfaceMac() {}
 

components/viz/service/display_embedder/gl_output_surface_mac.h

@@ -15,7 +15,8 @@ class GLOutputSurfaceMac : public GLOutputSurfaceBufferQueue {
   GLOutputSurfaceMac(scoped_refptr<InProcessContextProvider> context_provider,
                      gpu::SurfaceHandle surface_handle,
                      SyntheticBeginFrameSource* synthetic_begin_frame_source,
-                     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager);
+                     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
+                     bool allow_overlays);
   ~GLOutputSurfaceMac() override;
 
  private:

components/viz/service/display_embedder/gpu_display_provider.cc

@@ -35,6 +35,7 @@
 #if defined(OS_MACOSX)
 #include "components/viz/service/display_embedder/gl_output_surface_mac.h"
 #include "components/viz/service/display_embedder/software_output_device_mac.h"
+#include "ui/base/cocoa/remote_layer_api.h"
 #endif
 
 #if defined(USE_X11)
@@ -141,7 +142,8 @@ std::unique_ptr<Display> GpuDisplayProvider::CreateDisplay(
 #elif defined(OS_MACOSX)
       output_surface = std::make_unique<GLOutputSurfaceMac>(
           std::move(context_provider), surface_handle,
-          synthetic_begin_frame_source.get(), gpu_memory_buffer_manager_.get());
+          synthetic_begin_frame_source.get(), gpu_memory_buffer_manager_.get(),
+          renderer_settings.allow_overlays);
 #else
       NOTREACHED();
 #endif

content/browser/gpu/gpu_process_host.cc

@@ -146,6 +146,7 @@ static const char* const kSwitchNames[] = {
     switches::kVModule,
 #if defined(OS_MACOSX)
     switches::kDisableAVFoundationOverlays,
+    switches::kDisableMacOverlays,
     switches::kDisableRemoteCoreAnimation,
     switches::kEnableSandboxLogging,
     switches::kShowMacOverlayBorders,

services/viz/privileged/interfaces/compositing/renderer_settings.mojom

@@ -21,4 +21,5 @@ struct RendererSettings {
   bool enable_draw_occlusion;
   int32 slow_down_compositing_scale_factor;
   bool use_skia_renderer;
+  bool allow_overlays;
 };

services/viz/privileged/interfaces/compositing/renderer_settings_struct_traits.cc

@@ -26,6 +26,7 @@ bool StructTraits<viz::mojom::RendererSettingsDataView, viz::RendererSettings>::
   out->slow_down_compositing_scale_factor =
       data.slow_down_compositing_scale_factor();
   out->use_skia_renderer = data.use_skia_renderer();
+  out->allow_overlays = data.allow_overlays();
   return data.ReadResourceSettings(&out->resource_settings);
 }
 

services/viz/privileged/interfaces/compositing/renderer_settings_struct_traits.h

@@ -72,6 +72,10 @@ struct StructTraits<viz::mojom::RendererSettingsDataView,
     return input.use_skia_renderer;
   }
 
+  static bool allow_overlays(const viz::RendererSettings& input) {
+    return input.allow_overlays;
+  }
+
   static bool Read(viz::mojom::RendererSettingsDataView data,
                    viz::RendererSettings* out);
 };

ui/gfx/mojo/ca_layer_params.mojom

@@ -6,13 +6,17 @@ module gfx.mojom;
 
 import "ui/gfx/geometry/mojo/geometry.mojom";
 
+union CALayerContent {
+  uint32 ca_context_id;
+  handle io_surface_mach_port;
+};
+
 // gfx::CALayerParams
 struct CALayerParams {
   // TODO(676224): Use preprocessor to restrict platform-specific members to
   // desired platform.
   bool is_empty;
-  uint32 ca_context_id;
-  handle? io_surface_mach_port;
+  CALayerContent content;
   gfx.mojom.Size pixel_size;
   float scale_factor;
 };

ui/gfx/mojo/ca_layer_params_struct_traits.cc

@@ -10,33 +10,48 @@
 
 namespace mojo {
 
-mojo::ScopedHandle
-StructTraits<gfx::mojom::CALayerParamsDataView, gfx::CALayerParams>::
-    io_surface_mach_port(const gfx::CALayerParams& ca_layer_params) {
+gfx::mojom::CALayerContentPtr
+StructTraits<gfx::mojom::CALayerParamsDataView, gfx::CALayerParams>::content(
+    const gfx::CALayerParams& ca_layer_params) {
 #if defined(OS_MACOSX) && !defined(OS_IOS)
-  return mojo::WrapMachPort(ca_layer_params.io_surface_mach_port.get());
-#else
-  return mojo::ScopedHandle();
+  if (ca_layer_params.io_surface_mach_port) {
+    DCHECK(!ca_layer_params.ca_context_id);
+    return gfx::mojom::CALayerContent::NewIoSurfaceMachPort(
+        mojo::WrapMachPort(ca_layer_params.io_surface_mach_port.get()));
+  }
 #endif
+  return gfx::mojom::CALayerContent::NewCaContextId(
+      ca_layer_params.ca_context_id);
 }
 
 bool StructTraits<gfx::mojom::CALayerParamsDataView, gfx::CALayerParams>::Read(
     gfx::mojom::CALayerParamsDataView data,
     gfx::CALayerParams* out) {
   out->is_empty = data.is_empty();
-  out->ca_context_id = data.ca_context_id();
 
+  gfx::mojom::CALayerContentDataView content_data;
+  data.GetContentDataView(&content_data);
+  switch (content_data.tag()) {
+    case gfx::mojom::CALayerContentDataView::Tag::CA_CONTEXT_ID:
+      out->ca_context_id = content_data.ca_context_id();
+      break;
+    case gfx::mojom::CALayerContentDataView::Tag::IO_SURFACE_MACH_PORT:
 #if defined(OS_MACOSX) && !defined(OS_IOS)
-  mach_port_t io_surface_mach_port;
-  MojoResult unwrap_result =
-      mojo::UnwrapMachPort(data.TakeIoSurfaceMachPort(), &io_surface_mach_port);
-  if (unwrap_result != MOJO_RESULT_OK)
-    return false;
-  out->io_surface_mach_port.reset(io_surface_mach_port);
+      mach_port_t io_surface_mach_port;
+      MojoResult unwrap_result = mojo::UnwrapMachPort(
+          content_data.TakeIoSurfaceMachPort(), &io_surface_mach_port);
+      if (unwrap_result != MOJO_RESULT_OK)
+        return false;
+      out->io_surface_mach_port.reset(io_surface_mach_port);
+#else
+      return false;
 #endif
+      break;
+  }
 
   if (!data.ReadPixelSize(&out->pixel_size))
     return false;
+
   out->scale_factor = data.scale_factor();
   return true;
 }

ui/gfx/mojo/ca_layer_params_struct_traits.h

@@ -16,13 +16,6 @@ struct StructTraits<gfx::mojom::CALayerParamsDataView, gfx::CALayerParams> {
     return ca_layer_params.is_empty;
   }
 
-  static uint32_t ca_context_id(const gfx::CALayerParams& ca_layer_params) {
-    return ca_layer_params.ca_context_id;
-  }
-
-  static mojo::ScopedHandle io_surface_mach_port(
-      const gfx::CALayerParams& ca_layer_params);
-
   static gfx::Size pixel_size(const gfx::CALayerParams& ca_layer_params) {
     return ca_layer_params.pixel_size;
   }
@@ -31,6 +24,9 @@ struct StructTraits<gfx::mojom::CALayerParamsDataView, gfx::CALayerParams> {
     return ca_layer_params.scale_factor;
   }
 
+  static gfx::mojom::CALayerContentPtr content(
+      const gfx::CALayerParams& ca_layer_params);
+
   static bool Read(gfx::mojom::CALayerParamsDataView data,
                    gfx::CALayerParams* out);
 };