Merge the IPCs used for GPU process synchronization.

content/common/gpu/image_transport_surface_win.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/bind.h"
 #include "base/command_line.h"
@@ skipping 29 matching lines @@
   virtual bool SwapBuffers() OVERRIDE;
   virtual bool PostSubBuffer(int x, int y, int width, int height) OVERRIDE;
   virtual std::string GetExtensions() 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 ~PbufferImageTransportSurface();
   void SendBuffersSwapped();
   void DestroySurface();
 
   // Tracks the current buffer allocation state.
   bool backbuffer_suggested_allocation_;
@@ skipping 104 matching lines @@
 
 void PbufferImageTransportSurface::SendBuffersSwapped() {
   GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params params;
   params.surface_handle = reinterpret_cast<int64>(GetShareHandle());
   params.size = GetSize();
   helper_->SendAcceleratedSurfaceBuffersSwapped(params);
 
   helper_->SetScheduled(false);
 }
 
-void PbufferImageTransportSurface::OnBuffersSwappedACK() {
+void PbufferImageTransportSurface::OnBufferPresented() {
   helper_->SetScheduled(true);
 }
 
-void PbufferImageTransportSurface::OnPostSubBufferACK() {
-  NOTREACHED();
-}
-
 void PbufferImageTransportSurface::OnNewSurfaceACK(
     uint64 surface_handle,
     TransportDIB::Handle shm_handle) {
   NOTREACHED();
 }
 
 void PbufferImageTransportSurface::OnResizeViewACK() {
   NOTREACHED();
 }
 
@@ skipping 39 matching lines @@
                                                    handle.transport);
   }
 
   if (surface->Initialize())
     return surface;
   else
     return NULL;
 }
 
 #endif  // ENABLE_GPU