Clean up Mac swap acknowledgement code

content/browser/gpu/gpu_process_host_ui_shim.cc

 // Copyright (c) 2012 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/gpu/gpu_process_host_ui_shim.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 25 matching lines @@
 
 namespace content {
 
 namespace {
 
 // One of the linux specific headers defines this as a macro.
 #ifdef DestroyAll
 #undef DestroyAll
 #endif
 
-#if defined(OS_MACOSX)
-void OnSurfaceDisplayedCallback(int output_surface_id) {
-  content::ImageTransportFactory::GetInstance()->OnSurfaceDisplayed(
-      output_surface_id);
-}
-#endif
-
 base::LazyInstance<IDMap<GpuProcessHostUIShim> > g_hosts_by_id =
     LAZY_INSTANCE_INITIALIZER;
 
 void SendOnIOThreadTask(int host_id, IPC::Message* msg) {
   GpuProcessHost* host = GpuProcessHost::FromID(host_id);
   if (host)
     host->Send(msg);
   else
     delete msg;
 }
@@ skipping 177 matching lines @@
   // On Mac with delegated rendering, accelerated surfaces are not necessarily
   // associated with a RenderWidgetHostViewBase.
   AcceleratedSurfaceMsg_BufferPresented_Params ack_params;
 
   // If the frame was intended for an NSView that the gfx::AcceleratedWidget is
   // no longer attached to, do not pass the frame along to the widget. Just ack
   // it to the GPU process immediately, so we can proceed to the next frame.
   bool should_not_show_frame =
       content::ImageTransportFactory::GetInstance()
           ->SurfaceShouldNotShowFramesAfterSuspendForRecycle(params.surface_id);
-  if (should_not_show_frame) {
-    OnSurfaceDisplayedCallback(params.surface_id);
-  } else {
+  if (!should_not_show_frame) {
     gfx::AcceleratedWidget native_widget =
         content::GpuSurfaceTracker::Get()->AcquireNativeWidget(
             params.surface_id);
     base::ScopedCFTypeRef<IOSurfaceRef> io_surface;
     CAContextID ca_context_id = 0;
 
     switch (ui::GetSurfaceHandleType(params.surface_handle)) {
       case ui::kSurfaceHandleTypeIOSurface: {
         IOSurfaceID io_surface_id =
             ui::IOSurfaceIDFromSurfaceHandle(params.surface_handle);
         io_surface.reset(
             BrowserIOSurfaceManager::GetInstance()->AcquireIOSurface(
                 gfx::GenericSharedMemoryId(io_surface_id)));
         break;
       }
       case ui::kSurfaceHandleTypeCAContext: {
         ca_context_id = ui::CAContextIDFromSurfaceHandle(params.surface_handle);
         break;
       }
       default:
         DLOG(ERROR) << "Unrecognized accelerated frame type.";
         return;
     }
-    ui::AcceleratedWidgetMacGotAcceleratedFrame(
-        native_widget, ca_context_id, io_surface, params.latency_info,
-        params.size, params.scale_factor, params.damage_rect,
-        base::Bind(&OnSurfaceDisplayedCallback, params.surface_id),
-        &ack_params.disable_throttling, &ack_params.renderer_id,
-        &ack_params.vsync_timebase, &ack_params.vsync_interval);
+
+    ui::AcceleratedWidgetMacGotFrame(native_widget, ca_context_id, io_surface,
+                                     params.size, params.scale_factor,
+                                     &ack_params.vsync_timebase,
+                                     &ack_params.vsync_interval);
   }
+
+  content::ImageTransportFactory::GetInstance()->OnGpuSwapBuffersCompleted(
+      params.surface_id, params.latency_info, gfx::SwapResult::SWAP_ACK);
+
   Send(new AcceleratedSurfaceMsg_BufferPresented(params.route_id, ack_params));
 }
 #endif
 
 void GpuProcessHostUIShim::OnVideoMemoryUsageStatsReceived(
     const GPUVideoMemoryUsageStats& video_memory_usage_stats) {
   GpuDataManagerImpl::GetInstance()->UpdateVideoMemoryUsageStats(
       video_memory_usage_stats);
 }
 
 void GpuProcessHostUIShim::OnAddSubscription(
     int32 process_id, unsigned int target) {
   RenderProcessHost* rph = RenderProcessHost::FromID(process_id);
   if (rph) {
     rph->OnAddSubscription(target);
   }
 }
 
 void GpuProcessHostUIShim::OnRemoveSubscription(
     int32 process_id, unsigned int target) {
   RenderProcessHost* rph = RenderProcessHost::FromID(process_id);
   if (rph) {
     rph->OnRemoveSubscription(target);
   }
 }
 
 }  // namespace content