Plumb the partial swap though image transport.

content/common/gpu/image_transport_surface_linux.cc

 // Copyright (c) 2011 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"
 
 // This conflicts with the defines in Xlib.h and must come first.
 #include "content/common/gpu/gpu_messages.h"
@@ skipping 49 matching lines @@
   EGLImageTransportSurface(GpuChannelManager* manager,
                            int32 render_view_id,
                            int32 renderer_id,
                            int32 command_buffer_id);
 
   // GLSurface implementation
   virtual bool Initialize() OVERRIDE;
   virtual void Destroy() OVERRIDE;
   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;
   virtual bool OnMakeCurrent(gfx::GLContext* context) OVERRIDE;
   virtual unsigned int GetBackingFrameBufferObject() OVERRIDE;
   virtual void SetVisible(bool visible) OVERRIDE;
 
  protected:
   // ImageTransportSurface implementation
   virtual void OnNewSurfaceACK(
       uint64 surface_id, TransportDIB::Handle surface_handle) OVERRIDE;
   virtual void OnBuffersSwappedACK() OVERRIDE;
+  virtual void OnPostSubBufferACK() OVERRIDE;
   virtual void OnResizeViewACK() OVERRIDE;
   virtual void OnResize(gfx::Size size) OVERRIDE;
 
  private:
   virtual ~EGLImageTransportSurface() OVERRIDE;
   void ReleaseSurface(scoped_refptr<EGLAcceleratedSurface>* surface);
 
   uint32 fbo_id_;
 
   scoped_refptr<EGLAcceleratedSurface> back_surface_;
@@ skipping 14 matching lines @@
  public:
   GLXImageTransportSurface(GpuChannelManager* manager,
                            int32 render_view_id,
                            int32 renderer_id,
                            int32 command_buffer_id);
 
   // gfx::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 gfx::Size GetSize() OVERRIDE;
   virtual bool OnMakeCurrent(gfx::GLContext* context) OVERRIDE;
   virtual void SetVisible(bool visible) OVERRIDE;
 
  protected:
   // ImageTransportSurface implementation:
   virtual void OnNewSurfaceACK(
       uint64 surface_id, TransportDIB::Handle surface_handle) OVERRIDE;
   virtual void OnBuffersSwappedACK() OVERRIDE;
+  virtual void OnPostSubBufferACK() OVERRIDE;
   virtual void OnResizeViewACK() OVERRIDE;
   virtual void OnResize(gfx::Size size) OVERRIDE;
 
  private:
   virtual ~GLXImageTransportSurface();
 
   // Tell the browser to release the surface.
   void ReleaseSurface();
 
   XID dummy_parent_;
@@ skipping 22 matching lines @@
   OSMesaImageTransportSurface(GpuChannelManager* manager,
                               int32 render_view_id,
                               int32 renderer_id,
                               int32 command_buffer_id);
 
   // gfx::GLSurface implementation:
   virtual bool Initialize() OVERRIDE;
   virtual void Destroy() OVERRIDE;
   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_id, TransportDIB::Handle surface_handle) OVERRIDE;
   virtual void OnBuffersSwappedACK() OVERRIDE;
+  virtual void OnPostSubBufferACK() 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 174 matching lines @@
     glFramebufferTexture2DEXT(GL_FRAMEBUFFER,
                               GL_COLOR_ATTACHMENT0,
                               GL_TEXTURE_2D,
                               back_surface_->texture(),
                               0);
   }
   helper_->SetScheduled(false);
   return true;
 }
 
+bool EGLImageTransportSurface::PostSubBuffer(
+    int x, int y, int width, int height) {
+  NOTREACHED();
+  return false;
+}
+
+std::string EGLImageTransportSurface::GetExtensions() {
+  return GLSurface::GetExtensions();
+}
+
 gfx::Size EGLImageTransportSurface::GetSize() {
   return back_surface_->size();
 }
 
 void EGLImageTransportSurface::OnNewSurfaceACK(
     uint64 surface_id, TransportDIB::Handle /*surface_handle*/) {
   DCHECK_EQ(back_surface_->pixmap(), surface_id);
   helper_->SetScheduled(true);
 }
 
 void EGLImageTransportSurface::OnBuffersSwappedACK() {
   helper_->SetScheduled(true);
 }
 
+void EGLImageTransportSurface::OnPostSubBufferACK() {
+  NOTREACHED();
+}
 
 void EGLImageTransportSurface::OnResizeViewACK() {
   NOTREACHED();
 }
 
 GLXImageTransportSurface::GLXImageTransportSurface(
     GpuChannelManager* manager,
     int32 render_view_id,
     int32 renderer_id,
     int32 command_buffer_id)
@@ skipping 116 matching lines @@
   }
 
   GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params params;
   params.surface_id = window_;
   helper_->SendAcceleratedSurfaceBuffersSwapped(params);
 
   helper_->SetScheduled(false);
   return true;
 }
 
+bool GLXImageTransportSurface::PostSubBuffer(
+    int x, int y, int width, int height) {
+  gfx::NativeViewGLSurfaceGLX::PostSubBuffer(x, y, width, height);
+  glFlush();
+
+  if (needs_resize_) {
+    GpuHostMsg_AcceleratedSurfaceNew_Params params;
+    params.width = size_.width();
+    params.height = size_.height();
+    params.surface_id = window_;
+    helper_->SendAcceleratedSurfaceNew(params);
+    bound_ = true;
+    needs_resize_ = false;
+  }
+
+  GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params params;
+  params.surface_id = window_;
+  params.x = x;
+  params.y = y;
+  params.width = width;
+  params.height = height;
+
+  helper_->SendAcceleratedSurfacePostSubBuffer(params);
+
+  helper_->SetScheduled(false);
+  return true;
+}
+
 gfx::Size GLXImageTransportSurface::GetSize() {
   return size_;
 }
 
 bool GLXImageTransportSurface::OnMakeCurrent(gfx::GLContext* context) {
   if (made_current_)
     return true;
 
   // Check for driver support.
   Display* dpy = static_cast<Display*>(GetDisplay());
@@ skipping 14 matching lines @@
 }
 
 void GLXImageTransportSurface::OnNewSurfaceACK(
     uint64 surface_id, TransportDIB::Handle /*surface_handle*/) {
 }
 
 void GLXImageTransportSurface::OnBuffersSwappedACK() {
   helper_->SetScheduled(true);
 }
 
+void GLXImageTransportSurface::OnPostSubBufferACK() {
+  helper_->SetScheduled(true);
+}
+
 void GLXImageTransportSurface::OnResizeViewACK() {
   NOTREACHED();
 }
 
 OSMesaImageTransportSurface::OSMesaImageTransportSurface(
     GpuChannelManager* manager,
     int32 render_view_id,
     int32 renderer_id,
     int32 command_buffer_id)
   : gfx::GLSurfaceOSMesa(OSMESA_RGBA, gfx::Size(1, 1)),
@@ skipping 81 matching lines @@
   memcpy(shared_mem_->memory(), GetHandle(), size_.GetArea() * 4);
 
   GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params params;
   params.surface_id = shared_id_;
   helper_->SendAcceleratedSurfaceBuffersSwapped(params);
 
   helper_->SetScheduled(false);
   return true;
 }
 
+bool OSMesaImageTransportSurface::PostSubBuffer(
+    int x, int y, int width, int height) {
+  NOTREACHED();
+  return false;
+}
+
+std::string OSMesaImageTransportSurface::GetExtensions() {
+  return GLSurface::GetExtensions();
+}
+
 void OSMesaImageTransportSurface::OnBuffersSwappedACK() {
   helper_->SetScheduled(true);
 }
 
+void OSMesaImageTransportSurface::OnPostSubBufferACK() {
+  NOTREACHED();
+}
+
 gfx::Size OSMesaImageTransportSurface::GetSize() {
   return size_;
 }
 
 }  // namespace
 
 // static
 scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateSurface(
     GpuChannelManager* manager,
     int32 render_view_id,
@@ skipping 36 matching lines @@
                                                  command_buffer_id,
                                                  surface.get());
 #endif
   if (surface->Initialize())
     return surface;
   else
     return NULL;
 }
 
 #endif  // defined(USE_GPU)