Make Mac swap code like other platforms

content/browser/compositor/gpu_browser_compositor_output_surface.cc

Index: content/browser/compositor/gpu_browser_compositor_output_surface.cc
diff --git a/content/browser/compositor/gpu_browser_compositor_output_surface.cc b/content/browser/compositor/gpu_browser_compositor_output_surface.cc
index 7226a7cab02018c289043233f5d1056ab40f533c..8d10b058ac1ac42b457e4dc8ef8ed4c7fa3e43ee 100644
--- a/content/browser/compositor/gpu_browser_compositor_output_surface.cc
+++ b/content/browser/compositor/gpu_browser_compositor_output_surface.cc
@@ -17,6 +17,12 @@
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/ipc/client/command_buffer_proxy_impl.h"
 
+#if defined(OS_MACOSX)
+#include "content/browser/gpu/gpu_surface_tracker.h"
+#include "gpu/ipc/client/gpu_process_hosted_ca_layer_tree_params.h"
+#include "ui/accelerated_widget_mac/accelerated_widget_mac.h"
+#endif
+
 namespace content {
 
 GpuBrowserCompositorOutputSurface::GpuBrowserCompositorOutputSurface(
@@ -118,7 +124,20 @@ void GpuBrowserCompositorOutputSurface::SwapBuffers(
 
 void GpuBrowserCompositorOutputSurface::OnGpuSwapBuffersCompleted(
     const std::vector<ui::LatencyInfo>& latency_info,
-    gfx::SwapResult result) {
+    gfx::SwapResult result,
+    const gpu::GpuProcessHostedCALayerTreeParamsMac* params_mac) {
+#if defined(OS_MACOSX)

[ccameron, 2016/05/08 19:22:17]

I plumbed the gpu::GpuProcessHostedCALayerTreeParamsMac all the way here instead
of just making the ui::AcceleratedWidgetMacGotFrame calls in
CommandBufferProxyImpl::OnSwapBuffersCompleted because this location seems more
natural (in particular, the concept of SurfaceIsSuspendForRecycle, etc, is now
local instead of having to be looked up, so we can delete all of that
complicated code soon).

I do acknowledge that that plumbing is sort of ugly (it can all be killed soon,
though).

[piman, 2016/05/09 16:23:58]

This is the right place, I think. CommandBufferProxyImpl doesn't/shouldn't know
about the GpuSurfaceTracker and so on.
Well, this is an improvement over the previous code, so we can live with it, but
I'm looking forward to further improvements :)

+  if (!SurfaceIsSuspendForRecycle()) {
+    gfx::AcceleratedWidget native_widget =
+        content::GpuSurfaceTracker::Get()->AcquireNativeWidget(
+            params_mac->surface_handle);
+    ui::AcceleratedWidgetMacGotFrame(
+        native_widget, params_mac->ca_context_id,
+        params_mac->fullscreen_low_power_ca_context_valid,
+        params_mac->fullscreen_low_power_ca_context_id, params_mac->io_surface,
+        params_mac->pixel_size, params_mac->scale_factor, nullptr, nullptr);
+  }
+#endif
   RenderWidgetHostImpl::CompositorFrameDrawn(latency_info);
   OnSwapBuffersComplete();
 }