Merge the IPCs used for GPU process synchronization.

content/common/gpu/texture_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.
 
 #include "content/common/gpu/texture_image_transport_surface.h"
 
 #include "base/command_line.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/gpu_channel_manager.h"
 #include "content/common/gpu/gpu_messages.h"
@@ skipping 331 matching lines @@
 }
 
 unsigned TextureImageTransportSurface::GetFormat() {
   return parent_stub_ ? parent_stub_->surface()->GetFormat() : 0;
 }
 
 void TextureImageTransportSurface::OnNewSurfaceACK(
     uint64 surface_handle, TransportDIB::Handle /*shm_handle*/) {
 }
 
-void TextureImageTransportSurface::OnBuffersSwappedACK() {
+void TextureImageTransportSurface::OnBufferPresented() {
   if (helper_->MakeCurrent()) {
     if (textures_[front_].size != textures_[back()].size) {
       CreateBackTexture(textures_[front_].size);
     } else {
       AttachBackTextureToFBO();
     }
   }
 
   // Even if MakeCurrent fails, schedule anyway, to trigger the lost context
   // logic.
   helper_->SetScheduled(true);
 }
 
-void TextureImageTransportSurface::OnPostSubBufferACK() {
-  OnBuffersSwappedACK();
-}
-
 void TextureImageTransportSurface::OnResizeViewACK() {
   NOTREACHED();
 }
 
 void TextureImageTransportSurface::ReleaseBackTexture() {
   if (!parent_stub_)
     return;
   TextureInfo* info = textures_[back()].info;
   DCHECK(info);
 
@@ skipping 96 matching lines @@
     Texture& texture = textures_[i];
     texture.info = NULL;
     if (!texture.sent_to_client)
       continue;
     GpuHostMsg_AcceleratedSurfaceRelease_Params params;
     params.identifier = texture.client_id;
     helper_->SendAcceleratedSurfaceRelease(params);
   }
   parent_stub_ = NULL;
 }