Clean up Mac swap acknowledgement code

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 "cc/output/compositor_frame.h"
 #include "cc/output/output_surface_client.h"
 #include "content/browser/compositor/browser_compositor_overlay_candidate_validator.h"
 #include "content/browser/compositor/reflector_impl.h"
@@ skipping 10 matching lines @@
     const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager,
     scoped_ptr<BrowserCompositorOverlayCandidateValidator>
         overlay_candidate_validator)
     : BrowserCompositorOutputSurface(context,
                                      worker_context,
                                      vsync_manager,
                                      overlay_candidate_validator.Pass()),
 #if defined(OS_MACOSX)
       should_show_frames_state_(SHOULD_SHOW_FRAMES),
 #endif
-      swap_buffers_completion_callback_(
-          base::Bind(&GpuBrowserCompositorOutputSurface::OnSwapBuffersCompleted,
-                     base::Unretained(this))),
+      swap_buffers_completion_callback_(base::Bind(
+          &GpuBrowserCompositorOutputSurface::OnGpuSwapBuffersCompleted,
+          base::Unretained(this))),
       update_vsync_parameters_callback_(base::Bind(
           &BrowserCompositorOutputSurface::OnUpdateVSyncParametersFromGpu,
           base::Unretained(this))) {
 }
 
 GpuBrowserCompositorOutputSurface::~GpuBrowserCompositorOutputSurface() {}
 
 CommandBufferProxyImpl*
 GpuBrowserCompositorOutputSurface::GetCommandBufferProxy() {
   ContextProviderCommandBuffer* provider_command_buffer =
@@ skipping 55 matching lines @@
   client_->DidSwapBuffers();
 
 #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::OnSwapBuffersCompleted(
+void GpuBrowserCompositorOutputSurface::OnGpuSwapBuffersCompleted(
     const std::vector<ui::LatencyInfo>& latency_info,
     gfx::SwapResult result) {
-#if defined(OS_MACOSX)
-  // On Mac, delay acknowledging the swap to the output surface client until
-  // it has been drawn, see OnSurfaceDisplayed();
-  NOTREACHED();
-#else
   RenderWidgetHostImpl::CompositorFrameDrawn(latency_info);
   OnSwapBuffersComplete();
-#endif
 }
 
 #if defined(OS_MACOSX)
-void GpuBrowserCompositorOutputSurface::OnSurfaceDisplayed() {
-  cc::OutputSurface::OnSwapBuffersComplete();
-}
-
 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
     // them in GpuProcessHostUIShim, until the browser issues a SwapBuffers for
     // the new content.
     should_show_frames_state_ = SHOULD_NOT_SHOW_FRAMES_SUSPENDED;
   } else {
     // Discard the backbuffer before drawing the new frame. This is necessary
@@ skipping 20 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