Clean up Mac swap acknowledgement code

content/browser/compositor/gpu_browser_compositor_output_surface.h

 // 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.
 
 #ifndef CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
 #define CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
 
 #include "base/cancelable_callback.h"
 #include "content/browser/compositor/browser_compositor_output_surface.h"
 #include "ui/gfx/swap_result.h"
@@ skipping 18 matching lines @@
       const scoped_refptr<ContextProviderCommandBuffer>& worker_context,
       const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager,
       scoped_ptr<BrowserCompositorOverlayCandidateValidator>
           overlay_candidate_validator);
 
   ~GpuBrowserCompositorOutputSurface() override;
 
  protected:
   // BrowserCompositorOutputSurface:
   void OnReflectorChanged() override;
+  void OnGpuSwapBuffersCompleted(
+      const std::vector<ui::LatencyInfo>& latency_info,
+      gfx::SwapResult result) override;
 
   // cc::OutputSurface implementation.
   void SwapBuffers(cc::CompositorFrame* frame) override;
   bool BindToClient(cc::OutputSurfaceClient* client) override;
   bool SurfaceIsSuspendForRecycle() const override;
 
 #if defined(OS_MACOSX)
-  void OnSurfaceDisplayed() override;
   void SetSurfaceSuspendedForRecycle(bool suspended) override;
   bool SurfaceShouldNotShowFramesAfterSuspendForRecycle() const override;
   enum ShouldShowFramesState {
     // Frames that come from the GPU process should appear on-screen.
     SHOULD_SHOW_FRAMES,
     // The compositor has been suspended. Any frames that come from the GPU
     // process are for the pre-suspend content and should not be displayed.
     SHOULD_NOT_SHOW_FRAMES_SUSPENDED,
     // The compositor has been un-suspended, but has not yet issued a swap
     // since being un-suspended, so any frames that come from the GPU process
     // are for pre-suspend content and should not be displayed.
     SHOULD_NOT_SHOW_FRAMES_NO_SWAP_AFTER_SUSPENDED,
   };
   ShouldShowFramesState should_show_frames_state_;
 #endif
 
   CommandBufferProxyImpl* GetCommandBufferProxy();
-  virtual void OnSwapBuffersCompleted(
-      const std::vector<ui::LatencyInfo>& latency_info,
-      gfx::SwapResult result);
 
   base::CancelableCallback<void(const std::vector<ui::LatencyInfo>&,
                                 gfx::SwapResult)>
       swap_buffers_completion_callback_;
   base::CancelableCallback<void(base::TimeTicks timebase,
                                 base::TimeDelta interval)>
       update_vsync_parameters_callback_;
 
   scoped_ptr<ReflectorTexture> reflector_texture_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuBrowserCompositorOutputSurface);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_