gpu: reference target surfaces through a globally unique surface id.

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.
 
 #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 43 matching lines @@
 };
 
 // We are backed by an Pbuffer offscreen surface for the purposes of creating a
 // context, but use FBOs to render to X Pixmap backed EGLImages.
 class EGLImageTransportSurface
     : public ImageTransportSurface,
       public gfx::PbufferGLSurfaceEGL,
       public base::SupportsWeakPtr<EGLImageTransportSurface> {
  public:
   EGLImageTransportSurface(GpuChannelManager* manager,
-                           int32 render_view_id,
-                           int32 client_id,
-                           int32 command_buffer_id);
+                           GpuCommandBufferStub* stub);
 
   // 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;
   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;
+      uint64 surface_handle, TransportDIB::Handle shm_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);
   void SendBuffersSwapped();
 
@@ skipping 11 matching lines @@
 };
 
 // We render to an off-screen (but mapped) window that the browser process will
 // read from via XComposite
 class GLXImageTransportSurface
     : public ImageTransportSurface,
       public gfx::NativeViewGLSurfaceGLX,
       public base::SupportsWeakPtr<GLXImageTransportSurface> {
  public:
   GLXImageTransportSurface(GpuChannelManager* manager,
-                           int32 render_view_id,
-                           int32 client_id,
-                           int32 command_buffer_id);
+                           GpuCommandBufferStub* stub);
 
   // 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 std::string GetExtensions();
   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;
+      uint64 surface_handle, TransportDIB::Handle shm_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();
@@ skipping 18 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(GLXImageTransportSurface);
 };
 
 // We render to a hunk of shared memory that we get from the browser.
 // Swapping buffers simply means telling the browser to read the contents
 // of the memory.
 class OSMesaImageTransportSurface : public ImageTransportSurface,
                                     public gfx::GLSurfaceOSMesa {
  public:
   OSMesaImageTransportSurface(GpuChannelManager* manager,
-                              int32 render_view_id,
-                              int32 client_id,
-                              int32 command_buffer_id);
+                              GpuCommandBufferStub* stub);
 
   // 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;
+      uint64 surface_handle, TransportDIB::Handle shm_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();
@@ skipping 39 matching lines @@
 }
 
 EGLAcceleratedSurface::~EGLAcceleratedSurface() {
   glDeleteTextures(1, &texture_);
   eglDestroyImageKHR(gfx::GLSurfaceEGL::GetHardwareDisplay(), image_);
   XFreePixmap(gfx::GLSurfaceEGL::GetNativeDisplay(), pixmap_);
 }
 
 EGLImageTransportSurface::EGLImageTransportSurface(
     GpuChannelManager* manager,
-    int32 render_view_id,
-    int32 client_id,
-    int32 command_buffer_id)
-      : gfx::PbufferGLSurfaceEGL(false, gfx::Size(1, 1)),
-        fbo_id_(0),
-        made_current_(false) {
+    GpuCommandBufferStub* stub)
+    : gfx::PbufferGLSurfaceEGL(false, gfx::Size(1, 1)),
+      fbo_id_(0),
+      made_current_(false) {
   helper_.reset(new ImageTransportHelper(this,
                                          manager,
-                                         render_view_id,
-                                         client_id,
-                                         command_buffer_id,
+                                         stub,
                                          gfx::kNullPluginWindow));
 }
 
 EGLImageTransportSurface::~EGLImageTransportSurface() {
   Destroy();
 }
 
 bool EGLImageTransportSurface::Initialize() {
   if (!helper_->Initialize())
     return false;
@@ skipping 78 matching lines @@
                             GL_TEXTURE_2D,
                             back_surface_->texture(),
                             0);
   glFlush();
 
   glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, previous_fbo_id);
 
   GpuHostMsg_AcceleratedSurfaceNew_Params params;
   params.width = size.width();
   params.height = size.height();
-  params.surface_id = back_surface_->pixmap();
+  params.surface_handle = back_surface_->pixmap();
   helper_->SendAcceleratedSurfaceNew(params);
 
   helper_->SetScheduled(false);
 }
 
 bool EGLImageTransportSurface::SwapBuffers() {
   front_surface_.swap(back_surface_);
   DCHECK_NE(front_surface_.get(), static_cast<EGLAcceleratedSurface*>(NULL));
   helper_->DeferToFence(base::Bind(
       &EGLImageTransportSurface::SendBuffersSwapped,
       AsWeakPtr()));
 
   gfx::Size expected_size = front_surface_->size();
   if (!back_surface_.get() || back_surface_->size() != expected_size) {
     OnResize(expected_size);
   } else {
     glFramebufferTexture2DEXT(GL_FRAMEBUFFER,
                               GL_COLOR_ATTACHMENT0,
                               GL_TEXTURE_2D,
                               back_surface_->texture(),
                               0);
   }
   return true;
 }
 
 void EGLImageTransportSurface::SendBuffersSwapped() {
   GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params params;
-  params.surface_id = front_surface_->pixmap();
+  params.surface_handle = front_surface_->pixmap();
   helper_->SendAcceleratedSurfaceBuffersSwapped(params);
   helper_->SetScheduled(false);
 }
 
 bool EGLImageTransportSurface::PostSubBuffer(
     int x, int y, int width, int height) {
   NOTREACHED();
   return false;
 }
 
 std::string EGLImageTransportSurface::GetExtensions() {
   std::string extensions = gfx::GLSurface::GetExtensions();
   extensions += extensions.empty() ? "" : " ";
   extensions += "GL_CHROMIUM_front_buffer_cached";
   return extensions;
 }
 
 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);
+    uint64 surface_handle, TransportDIB::Handle /*shm_handle*/) {
+  DCHECK_EQ(back_surface_->pixmap(), surface_handle);
   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 client_id,
-    int32 command_buffer_id)
-      : gfx::NativeViewGLSurfaceGLX(),
-        dummy_parent_(0),
-        size_(1, 1),
-        bound_(false),
-        needs_resize_(false),
-        made_current_(false) {
+    GpuCommandBufferStub* stub)
+    : gfx::NativeViewGLSurfaceGLX(),
+      dummy_parent_(0),
+      size_(1, 1),
+      bound_(false),
+      needs_resize_(false),
+      made_current_(false) {
   helper_.reset(new ImageTransportHelper(this,
                                          manager,
-                                         render_view_id,
-                                         client_id,
-                                         command_buffer_id,
+                                         stub,
                                          gfx::kNullPluginWindow));
 }
 
 GLXImageTransportSurface::~GLXImageTransportSurface() {
   Destroy();
 }
 
 bool GLXImageTransportSurface::Initialize() {
   // Create a dummy window to host the real window.
   Display* dpy = static_cast<Display*>(GetDisplay());
@@ skipping 89 matching lines @@
 bool GLXImageTransportSurface::SwapBuffers() {
   gfx::NativeViewGLSurfaceGLX::SwapBuffers();
   helper_->DeferToFence(base::Bind(
       &GLXImageTransportSurface::SendBuffersSwapped,
       AsWeakPtr()));
 
   if (needs_resize_) {
     GpuHostMsg_AcceleratedSurfaceNew_Params params;
     params.width = size_.width();
     params.height = size_.height();
-    params.surface_id = window_;
+    params.surface_handle = window_;
     helper_->SendAcceleratedSurfaceNew(params);
     bound_ = true;
     needs_resize_ = false;
   }
   return true;
 }
 
 void GLXImageTransportSurface::SendBuffersSwapped() {
   GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params params;
-  params.surface_id = window_;
+  params.surface_handle = window_;
   helper_->SendAcceleratedSurfaceBuffersSwapped(params);
   helper_->SetScheduled(false);
 }
 
 bool GLXImageTransportSurface::PostSubBuffer(
     int x, int y, int width, int height) {
   gfx::NativeViewGLSurfaceGLX::PostSubBuffer(x, y, width, height);
   helper_->DeferToFence(base::Bind(
       &GLXImageTransportSurface::SendPostSubBuffer,
       AsWeakPtr(), x, y, width, height));
 
   if (needs_resize_) {
     GpuHostMsg_AcceleratedSurfaceNew_Params params;
     params.width = size_.width();
     params.height = size_.height();
-    params.surface_id = window_;
+    params.surface_handle = window_;
     helper_->SendAcceleratedSurfaceNew(params);
     bound_ = true;
     needs_resize_ = false;
   }
   return true;
 }
 
 void GLXImageTransportSurface::SendPostSubBuffer(
     int x, int y, int width, int height) {
   GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params params;
-  params.surface_id = window_;
+  params.surface_handle = window_;
   params.x = x;
   params.y = y;
   params.width = width;
   params.height = height;
 
   helper_->SendAcceleratedSurfacePostSubBuffer(params);
   helper_->SetScheduled(false);
 }
 
 std::string GLXImageTransportSurface::GetExtensions() {
@@ skipping 23 matching lines @@
     }
   }
 
   context->SetSwapInterval(0);
 
   made_current_ = true;
   return true;
 }
 
 void GLXImageTransportSurface::OnNewSurfaceACK(
-    uint64 surface_id, TransportDIB::Handle /*surface_handle*/) {
+    uint64 surface_handle, TransportDIB::Handle /*shm_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 client_id,
-    int32 command_buffer_id)
-  : gfx::GLSurfaceOSMesa(OSMESA_RGBA, gfx::Size(1, 1)),
-    size_(gfx::Size(1, 1)) {
+    GpuCommandBufferStub* stub)
+    : gfx::GLSurfaceOSMesa(OSMESA_RGBA, gfx::Size(1, 1)),
+      size_(gfx::Size(1, 1)) {
   helper_.reset(new ImageTransportHelper(this,
                                          manager,
-                                         render_view_id,
-                                         client_id,
-                                         command_buffer_id,
+                                         stub,
                                          gfx::kNullPluginWindow));
 }
 
 OSMesaImageTransportSurface::~OSMesaImageTransportSurface() {
   Destroy();
 }
 
 bool OSMesaImageTransportSurface::Initialize() {
   if (!helper_->Initialize())
     return false;
@@ skipping 31 matching lines @@
 
   // Now that we resized/reallocated the memory buffer, we need to change
   // what OSMesa is pointing at to the new buffer.
   helper_->MakeCurrent();
 
   size_ = size;
 
   GpuHostMsg_AcceleratedSurfaceNew_Params params;
   params.width = size_.width();
   params.height = size_.height();
-  params.surface_id = 0;  // id comes from the browser with the shared mem
+  params.surface_handle = 0;  // id comes from the browser with the shared mem
   helper_->SendAcceleratedSurfaceNew(params);
 
   helper_->SetScheduled(false);
 }
 
 void OSMesaImageTransportSurface::OnNewSurfaceACK(
-    uint64 surface_id, TransportDIB::Handle surface_handle) {
-  shared_id_ = surface_id;
-  shared_mem_.reset(TransportDIB::Map(surface_handle));
+    uint64 surface_handle, TransportDIB::Handle shm_handle) {
+  shared_id_ = surface_handle;
+  shared_mem_.reset(TransportDIB::Map(shm_handle));
   DCHECK_NE(shared_mem_.get(), static_cast<void*>(NULL));
 
   helper_->SetScheduled(true);
 }
 
 void OSMesaImageTransportSurface::OnResizeViewACK() {
   NOTREACHED();
 }
 
 bool OSMesaImageTransportSurface::SwapBuffers() {
   DCHECK_NE(shared_mem_.get(), static_cast<void*>(NULL));
 
   // Copy the OSMesa buffer to the shared memory
   glFinish();
   memcpy(shared_mem_->memory(), GetHandle(), size_.GetArea() * 4);
 
   GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params params;
-  params.surface_id = shared_id_;
+  params.surface_handle = shared_id_;
   helper_->SendAcceleratedSurfaceBuffersSwapped(params);
 
   helper_->SetScheduled(false);
   return true;
 }
 
 bool OSMesaImageTransportSurface::PostSubBuffer(
     int x, int y, int width, int height) {
   DCHECK_NE(shared_mem_.get(), static_cast<void*>(NULL));
 
   // Copy the OSMesa buffer to the shared memory
   glFinish();
 
   int flipped_y = GetSize().height() - y - height;
 
   for (int row = 0; row < height; ++row) {
     int mem_offset = ((flipped_y + row) * size_.width() + x);
     int32* dest_address = static_cast<int32*>(shared_mem_->memory()) +
         mem_offset;
     int32* src_address = static_cast<int32*>(GetHandle()) + mem_offset;
     memcpy(dest_address, src_address, width * 4);
   }
 
   GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params params;
-  params.surface_id = shared_id_;
+  params.surface_handle = shared_id_;
   params.x = x;
   params.y = y;
   params.width = width;
   params.height = height;
   helper_->SendAcceleratedSurfacePostSubBuffer(params);
 
   helper_->SetScheduled(false);
   return true;
 }
 
@@ skipping 15 matching lines @@
 
 gfx::Size OSMesaImageTransportSurface::GetSize() {
   return size_;
 }
 
 }  // namespace
 
 // static
 scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateSurface(
     GpuChannelManager* manager,
-    int32 render_view_id,
-    int32 client_id,
-    int32 command_buffer_id,
+    GpuCommandBufferStub* stub,
     gfx::PluginWindowHandle handle) {
   scoped_refptr<gfx::GLSurface> surface;
 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
   switch (gfx::GetGLImplementation()) {
     case gfx::kGLImplementationDesktopGL:
-      surface = new GLXImageTransportSurface(manager,
-                                             render_view_id,
-                                             client_id,
-                                             command_buffer_id);
+      surface = new GLXImageTransportSurface(manager, stub);
       break;
     case gfx::kGLImplementationEGLGLES2:
-      surface = new EGLImageTransportSurface(manager,
-                                             render_view_id,
-                                             client_id,
-                                             command_buffer_id);
+      surface = new EGLImageTransportSurface(manager, stub);
       break;
     case gfx::kGLImplementationOSMesaGL:
-      surface = new OSMesaImageTransportSurface(manager,
-                                                render_view_id,
-                                                client_id,
-                                                command_buffer_id);
+      surface = new OSMesaImageTransportSurface(manager, stub);
       break;
     default:
       NOTREACHED();
       return NULL;
   }
 #else
   surface = gfx::GLSurface::CreateViewGLSurface(false, handle);
   if (!surface.get())
     return NULL;
 
-  surface = new PassThroughImageTransportSurface(manager,
-                                                 render_view_id,
-                                                 client_id,
-                                                 command_buffer_id,
-                                                 surface.get());
+  surface = new PassThroughImageTransportSurface(manager, stub, surface.get());
 #endif
   if (surface->Initialize())
     return surface;
   else
     return NULL;
 }
 
 #endif  // defined(USE_GPU)