Make Mac swap code like other platforms

content/browser/compositor/gpu_browser_compositor_output_surface.cc

 // Copyright 2014 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 "content/browser/compositor/gpu_browser_compositor_output_surface.h"
 
 #include <utility>
 
 #include "build/build_config.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/output_surface_client.h"
 #include "components/display_compositor/compositor_overlay_candidate_validator.h"
 #include "content/browser/compositor/reflector_impl.h"
 #include "content/browser/compositor/reflector_texture.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #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(
     const scoped_refptr<ContextProviderCommandBuffer>& context,
     const scoped_refptr<ContextProviderCommandBuffer>& worker_context,
     const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager,
     base::SingleThreadTaskRunner* task_runner,
     std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
         overlay_candidate_validator)
     : BrowserCompositorOutputSurface(context,
@@ skipping 81 matching lines @@
 #if defined(OS_MACOSX)
   if (should_show_frames_state_ ==
       SHOULD_NOT_SHOW_FRAMES_NO_SWAP_AFTER_SUSPENDED) {
     should_show_frames_state_ = SHOULD_SHOW_FRAMES;
   }
 #endif
 }
 
 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();
 }
 
 #if defined(OS_MACOSX)
 void GpuBrowserCompositorOutputSurface::SetSurfaceSuspendedForRecycle(
     bool suspended) {
   if (suspended) {
     // It may be that there are frames in-flight from the GPU process back to
     // the browser. Make sure that these frames are not displayed by ignoring
@@ skipping 11 matching lines @@
     // observe).
     if (should_show_frames_state_ == SHOULD_NOT_SHOW_FRAMES_SUSPENDED) {
       DiscardBackbuffer();
       should_show_frames_state_ =
           SHOULD_NOT_SHOW_FRAMES_NO_SWAP_AFTER_SUSPENDED;
     }
   }
 }
 
 bool GpuBrowserCompositorOutputSurface::
     SurfaceShouldNotShowFramesAfterSuspendForRecycle() const {

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

Am I right to assume that this (and maybe SetSurfaceSuspendedForRecycle  and
associated state) can be removed as well (as a follow up maybe)?

[ccameron, 2016/05/09 18:40:36]

Once we're doing the CALayer tree construction in the browser process, we'll be
able to get rid of this (it exists to work around synchronization issues across
the processes).

   return should_show_frames_state_ != SHOULD_SHOW_FRAMES;
 }
 #endif
 
 bool GpuBrowserCompositorOutputSurface::SurfaceIsSuspendForRecycle() const {
 #if defined(OS_MACOSX)
   return should_show_frames_state_ == SHOULD_NOT_SHOW_FRAMES_SUSPENDED;
 #else
   return false;
 #endif
 }
 
 }  // namespace content