Merge the IPCs used for GPU process synchronization.

content/common/gpu/image_transport_surface.h

 // 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.
 
 #ifndef CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_H_
 #define CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_H_
 #pragma once
 
 #if defined(ENABLE_GPU)
 
@@ skipping 45 matching lines @@
 // making sure outside events reach the ImageTransportSurface and
 // allowing the ImageTransportSurface to send events to the outside world.
 
 class ImageTransportSurface {
  public:
   ImageTransportSurface();
   virtual ~ImageTransportSurface();
 
   virtual void OnNewSurfaceACK(
       uint64 surface_id, TransportDIB::Handle surface_handle) = 0;
-  virtual void OnBuffersSwappedACK() = 0;
-  virtual void OnPostSubBufferACK() = 0;
+  virtual void OnBufferPresented() = 0;
   virtual void OnResizeViewACK() = 0;
   virtual void OnResize(gfx::Size size) = 0;
 
   // Creates the appropriate surface depending on the GL implementation.
   static scoped_refptr<gfx::GLSurface>
       CreateSurface(GpuChannelManager* manager,
                     GpuCommandBufferStub* stub,
                     const gfx::GLSurfaceHandle& handle);
  protected:
   // Used by certain implements of PostSubBuffer to determine
@@ skipping 50 matching lines @@
   void Suspend();
 
   GpuChannelManager* manager() const { return manager_; }
 
  private:
   gpu::GpuScheduler* Scheduler();
   gpu::gles2::GLES2Decoder* Decoder();
 
   // IPC::Message handlers.
   void OnNewSurfaceACK(uint64 surface_handle, TransportDIB::Handle shm_handle);
-  void OnBuffersSwappedACK();
-  void OnPostSubBufferACK();
+  void OnBufferPresented();
   void OnResizeViewACK();
 
   // Backbuffer resize callback.
   void Resize(gfx::Size size);
 
   // Weak pointers that point to objects that outlive this helper.
   ImageTransportSurface* surface_;
   GpuChannelManager* manager_;
 
   base::WeakPtr<GpuCommandBufferStub> stub_;
@@ skipping 17 matching lines @@
   // GLSurface implementation.
   virtual bool Initialize() OVERRIDE;
   virtual void Destroy() OVERRIDE;
   virtual bool SwapBuffers() OVERRIDE;
   virtual bool PostSubBuffer(int x, int y, int width, int height) OVERRIDE;
   virtual bool OnMakeCurrent(gfx::GLContext* context) OVERRIDE;
 
   // 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;
 
  protected:
   virtual ~PassThroughImageTransportSurface();
 
  private:
   scoped_ptr<ImageTransportHelper> helper_;
   gfx::Size new_size_;
   bool transport_;
   bool did_set_swap_interval_;
 
   DISALLOW_COPY_AND_ASSIGN(PassThroughImageTransportSurface);
 };
 
 #endif  // defined(ENABLE_GPU)
 
 #endif  // CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_H_