Mac Overlays: Wire up overlays on Mac

content/browser/compositor/gpu_process_transport_factory.cc

Index: content/browser/compositor/gpu_process_transport_factory.cc
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
index 8750ccd8e64100cb01029e8c76091d0261dfb68d..c3563d517dca8ccafc5ec860acb8f4edb5c5d6bd 100644
--- a/content/browser/compositor/gpu_process_transport_factory.cc
+++ b/content/browser/compositor/gpu_process_transport_factory.cc
@@ -64,6 +64,7 @@
 #include "content/browser/compositor/software_output_device_x11.h"
 #elif defined(OS_MACOSX)
 #include "content/browser/compositor/software_output_device_mac.h"
+#include "ui/base/cocoa/remote_layer_api.h"
 #endif
 
 using cc::ContextProvider;
@@ -287,9 +288,21 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
     } else
 #endif
     {
-      surface = make_scoped_ptr(new GpuBrowserCompositorOutputSurface(
-          context_provider, compositor->vsync_manager(),
-          CreateOverlayCandidateValidator(compositor->widget())));
+#if defined(OS_MACOSX)
+      if (ui::RemoteLayerAPISupported()) {
+        surface =
+            make_scoped_ptr(new GpuSurfacelessBrowserCompositorOutputSurface(
+                context_provider, data->surface_id, compositor->vsync_manager(),
+                CreateOverlayCandidateValidator(compositor->widget()),
+                GL_TEXTURE_RECTANGLE_ARB, GL_BGRA_EXT,
+                BrowserGpuMemoryBufferManager::current()));
+      }
+#endif
+      if (!surface) {
+        surface = make_scoped_ptr(new GpuBrowserCompositorOutputSurface(
+            context_provider, compositor->vsync_manager(),
+            CreateOverlayCandidateValidator(compositor->widget())));
+      }
     }
   }