Merge the IPCs used for GPU process synchronization.

content/common/gpu/image_transport_surface_mac.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.
 
 #if defined(ENABLE_GPU)
 
 #include "content/common/gpu/image_transport_surface.h"
 
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 26 matching lines @@
   virtual gfx::Size GetSize() OVERRIDE;
   virtual bool OnMakeCurrent(gfx::GLContext* context) OVERRIDE;
   virtual unsigned int GetBackingFrameBufferObject() OVERRIDE;
   virtual void SetBackbufferAllocation(bool allocated) OVERRIDE;
   virtual void SetFrontbufferAllocation(bool allocated) OVERRIDE;
 
  protected:
   // ImageTransportSurface implementation
   virtual void OnNewSurfaceACK(uint64 surface_handle,
                                TransportDIB::Handle shm_handle) OVERRIDE;
-  virtual void OnBuffersSwappedACK() OVERRIDE;
-  virtual void OnPostSubBufferACK() OVERRIDE;
+  virtual void OnBufferPresented() OVERRIDE;
   virtual void OnResizeViewACK() OVERRIDE;
   virtual void OnResize(gfx::Size size) OVERRIDE;
 
  private:
   virtual ~IOSurfaceImageTransportSurface() OVERRIDE;
 
   void AdjustBufferAllocation();
   void UnrefIOSurface();
   void CreateIOSurface();
 
@@ skipping 169 matching lines @@
   extensions += extensions.empty() ? "" : " ";
   extensions += "GL_CHROMIUM_front_buffer_cached ";
   extensions += "GL_CHROMIUM_post_sub_buffer";
   return extensions;
 }
 
 gfx::Size IOSurfaceImageTransportSurface::GetSize() {
   return size_;
 }
 
-void IOSurfaceImageTransportSurface::OnBuffersSwappedACK() {
+void IOSurfaceImageTransportSurface::OnBufferPresented() {
   helper_->SetScheduled(true);
 }
 
-void IOSurfaceImageTransportSurface::OnPostSubBufferACK() {
-  helper_->SetScheduled(true);
-}
-
 void IOSurfaceImageTransportSurface::OnNewSurfaceACK(
     uint64 surface_handle,
     TransportDIB::Handle /* shm_handle */) {
   NOTREACHED();
 }
 
 void IOSurfaceImageTransportSurface::OnResizeViewACK() {
   NOTREACHED();
 }
 
@@ skipping 124 matching lines @@
       NOTREACHED();
       return NULL;
   }
   if (surface->Initialize())
     return surface;
   else
     return NULL;
 }
 
 #endif  // defined(USE_GPU)