Merge the IPCs used for GPU process synchronization.

content/common/gpu/image_transport_surface_linux.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/image_transport_surface.h"
 
 // This conflicts with the defines in Xlib.h and must come first.
 #include "content/common/gpu/gpu_messages.h"
 
 #include <X11/Xlib.h>
@@ skipping 82 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 ~EGLImageTransportSurface() OVERRIDE;
   void ReleaseSurface(scoped_refptr<EGLAcceleratedSurface>* surface);
   void SendBuffersSwapped();
   void SendPostSubBuffer(int x, int y, int width, int height);
 
   // Tracks the current buffer allocation state.
@@ skipping 35 matching lines @@
   virtual std::string GetExtensions();
   virtual gfx::Size GetSize() OVERRIDE;
   virtual bool OnMakeCurrent(gfx::GLContext* context) 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 ~GLXImageTransportSurface();
 
   // Tell the browser to release the surface.
   void ReleaseSurface();
 
   void SendBuffersSwapped();
@@ skipping 37 matching lines @@
   virtual bool IsOffscreen() OVERRIDE;
   virtual bool SwapBuffers() OVERRIDE;
   virtual bool PostSubBuffer(int x, int y, int width, int height) OVERRIDE;
   virtual std::string GetExtensions() OVERRIDE;
   virtual gfx::Size GetSize() 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 ~OSMesaImageTransportSurface();
 
   // Tell the browser to release the surface.
   void ReleaseSurface();
 
   scoped_ptr<TransportDIB> shared_mem_;
@@ skipping 281 matching lines @@
 gfx::Size EGLImageTransportSurface::GetSize() {
   return back_surface_->size();
 }
 
 void EGLImageTransportSurface::OnNewSurfaceACK(
     uint64 surface_handle, TransportDIB::Handle /*shm_handle*/) {
   DCHECK_EQ(back_surface_->pixmap(), surface_handle);
   helper_->SetScheduled(true);
 }
 
-void EGLImageTransportSurface::OnBuffersSwappedACK() {
+void EGLImageTransportSurface::OnBufferPresented() {
   helper_->SetScheduled(true);
 }
 
-void EGLImageTransportSurface::OnPostSubBufferACK() {
-  helper_->SetScheduled(true);
-}
-
 void EGLImageTransportSurface::OnResizeViewACK() {
   NOTREACHED();
 }
 
 GLXImageTransportSurface::GLXImageTransportSurface(
     GpuChannelManager* manager,
     GpuCommandBufferStub* stub)
     : gfx::NativeViewGLSurfaceGLX(),
       backbuffer_suggested_allocation_(true),
       frontbuffer_suggested_allocation_(true),
@@ skipping 213 matching lines @@
   context->SetSwapInterval(0);
 
   made_current_ = true;
   return true;
 }
 
 void GLXImageTransportSurface::OnNewSurfaceACK(
     uint64 surface_handle, TransportDIB::Handle /*shm_handle*/) {
 }
 
-void GLXImageTransportSurface::OnBuffersSwappedACK() {
+void GLXImageTransportSurface::OnBufferPresented() {
   helper_->SetScheduled(true);
 }
 
-void GLXImageTransportSurface::OnPostSubBufferACK() {
-  helper_->SetScheduled(true);
-}
-
 void GLXImageTransportSurface::OnResizeViewACK() {
   NOTREACHED();
 }
 
 OSMesaImageTransportSurface::OSMesaImageTransportSurface(
     GpuChannelManager* manager,
     GpuCommandBufferStub* stub)
     : gfx::GLSurfaceOSMesa(OSMESA_RGBA, gfx::Size(1, 1)),
       size_(gfx::Size(1, 1)) {
   helper_.reset(new ImageTransportHelper(this,
@@ skipping 114 matching lines @@
 }
 
 std::string OSMesaImageTransportSurface::GetExtensions() {
   std::string extensions = gfx::GLSurface::GetExtensions();
   extensions += extensions.empty() ? "" : " ";
   extensions += "GL_CHROMIUM_front_buffer_cached ";
   extensions += "GL_CHROMIUM_post_sub_buffer";
   return extensions;
 }
 
-void OSMesaImageTransportSurface::OnBuffersSwappedACK() {
+void OSMesaImageTransportSurface::OnBufferPresented() {
   helper_->SetScheduled(true);
 }
 
-void OSMesaImageTransportSurface::OnPostSubBufferACK() {
-  helper_->SetScheduled(true);
-}
-
 gfx::Size OSMesaImageTransportSurface::GetSize() {
   return size_;
 }
 
 }  // namespace
 
 // static
 scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateSurface(
     GpuChannelManager* manager,
     GpuCommandBufferStub* stub,
@@ skipping 27 matching lines @@
                                                    stub,
                                                    surface.get(),
                                                    handle.transport);
   }
 
   if (surface->Initialize())
     return surface;
   else
     return NULL;
 }