Merge the IPCs used for GPU process synchronization.

content/common/gpu/image_transport_surface.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/bind_helpers.h"
@@ skipping 72 matching lines @@
        base::Bind(&ImageTransportHelper::Resize, base::Unretained(this)));
 
   return true;
 }
 
 void ImageTransportHelper::Destroy() {}
 
 bool ImageTransportHelper::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ImageTransportHelper, message)
-    IPC_MESSAGE_HANDLER(AcceleratedSurfaceMsg_BuffersSwappedACK,
-                        OnBuffersSwappedACK)
-    IPC_MESSAGE_HANDLER(AcceleratedSurfaceMsg_PostSubBufferACK,
-                        OnPostSubBufferACK)
+    IPC_MESSAGE_HANDLER(AcceleratedSurfaceMsg_BufferPresented,
+                        OnBufferPresented)
     IPC_MESSAGE_HANDLER(AcceleratedSurfaceMsg_NewACK,
                         OnNewSurfaceACK)
     IPC_MESSAGE_HANDLER(AcceleratedSurfaceMsg_ResizeViewACK, OnResizeViewACK);
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void ImageTransportHelper::SendAcceleratedSurfaceNew(
     GpuHostMsg_AcceleratedSurfaceNew_Params params) {
@@ skipping 87 matching lines @@
     return NULL;
   return stub_->decoder();
 }
 
 void ImageTransportHelper::OnNewSurfaceACK(
     uint64 surface_handle,
     TransportDIB::Handle shm_handle) {
   surface_->OnNewSurfaceACK(surface_handle, shm_handle);
 }
 
-void ImageTransportHelper::OnBuffersSwappedACK() {
-  surface_->OnBuffersSwappedACK();
-}
-
-void ImageTransportHelper::OnPostSubBufferACK() {
-  surface_->OnPostSubBufferACK();
+void ImageTransportHelper::OnBufferPresented() {
+  surface_->OnBufferPresented();
 }
 
 void ImageTransportHelper::OnResizeViewACK() {
   surface_->OnResizeViewACK();
 }
 
 void ImageTransportHelper::Resize(gfx::Size size) {
   // On windows, the surface is recreated and, in case the newly allocated
   // surface happens to have the same address, it should be invalidated on the
   // decoder so that future calls to MakeCurrent do not early out on the
@@ skipping 82 matching lines @@
     did_set_swap_interval_ = true;
   }
   return true;
 }
 
 void PassThroughImageTransportSurface::OnNewSurfaceACK(
     uint64 surface_handle,
     TransportDIB::Handle shm_handle) {
 }
 
-void PassThroughImageTransportSurface::OnBuffersSwappedACK() {
+void PassThroughImageTransportSurface::OnBufferPresented() {
   DCHECK(transport_);
   helper_->SetScheduled(true);
 }
-
-void PassThroughImageTransportSurface::OnPostSubBufferACK() {
-  DCHECK(transport_);
-  helper_->SetScheduled(true);
-}
 
 void PassThroughImageTransportSurface::OnResizeViewACK() {
   DCHECK(transport_);
   Resize(new_size_);
 
   helper_->SetScheduled(true);
 }
 
 void PassThroughImageTransportSurface::OnResize(gfx::Size size) {
   new_size_ = size;
 
   if (transport_) {
     helper_->SendResizeView(size);
     helper_->SetScheduled(false);
   } else {
     Resize(new_size_);
   }
 }
 
 PassThroughImageTransportSurface::~PassThroughImageTransportSurface() {}
 
 #endif  // defined(ENABLE_GPU)