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)
+  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 25 matching lines @@
 
 bool GpuBrowserCompositorOutputSurface::SurfaceIsSuspendForRecycle() const {
 #if defined(OS_MACOSX)
   return should_show_frames_state_ == SHOULD_NOT_SHOW_FRAMES_SUSPENDED;
 #else
   return false;
 #endif
 }
 
 }  // namespace content