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

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)
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_message.h"
 #include "ui/gfx/gl/gl_surface.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/surface/transport_dib.h"
 
 class GpuChannelManager;
+class GpuCommandBufferStub;
 
 struct GpuHostMsg_AcceleratedSurfaceNew_Params;
 struct GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params;
 struct GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params;
 struct GpuHostMsg_AcceleratedSurfaceRelease_Params;
 
 namespace gfx {
 class GLSurface;
 }
 
@@ skipping 26 matching lines @@
   virtual void OnNewSurfaceACK(
       uint64 surface_id, TransportDIB::Handle surface_handle) = 0;
   virtual void OnBuffersSwappedACK() = 0;
   virtual void OnPostSubBufferACK() = 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,
-                    int32 render_view_id,
-                    int32 client_id,
-                    int32 command_buffer_id,
+                    GpuCommandBufferStub* stub,
                     gfx::PluginWindowHandle handle);
  private:
   DISALLOW_COPY_AND_ASSIGN(ImageTransportSurface);
 };
 
 class ImageTransportHelper : public IPC::Channel::Listener {
  public:
   // Takes weak pointers to objects that outlive the helper.
   ImageTransportHelper(ImageTransportSurface* surface,
                        GpuChannelManager* manager,
-                       int32 render_view_id,
-                       int32 client_id,
-                       int32 command_buffer_id,
+                       GpuCommandBufferStub* stub,
                        gfx::PluginWindowHandle handle);
   virtual ~ImageTransportHelper();
 
   bool Initialize();
   void Destroy();
 
   // IPC::Channel::Listener implementation:
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // Helper send functions. Caller fills in the surface specific params
@@ skipping 14 matching lines @@
   void DeferToFence(base::Closure task);
 
   // Make the surface's context current.
   bool MakeCurrent();
 
  private:
   gpu::GpuScheduler* Scheduler();
   gpu::gles2::GLES2Decoder* Decoder();
 
   // IPC::Message handlers.
-  void OnNewSurfaceACK(uint64 surface_id, TransportDIB::Handle surface_handle);
+  void OnNewSurfaceACK(uint64 surface_handle, TransportDIB::Handle shm_handle);
   void OnBuffersSwappedACK();
   void OnPostSubBufferACK();
   void OnResizeViewACK();
 
   // Backbuffer resize callback.
   void Resize(gfx::Size size);
 
   // Set the default swap interval on the surface.
   void SetSwapInterval();
 
   // Weak pointers that point to objects that outlive this helper.
   ImageTransportSurface* surface_;
   GpuChannelManager* manager_;
 
-  int32 render_view_id_;
-  int32 client_id_;
-  int32 command_buffer_id_;
+  base::WeakPtr<GpuCommandBufferStub> stub_;
   int32 route_id_;
   gfx::PluginWindowHandle handle_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageTransportHelper);
 };
 
 // An implementation of ImageTransportSurface that implements GLSurface through
 // GLSurfaceAdapter, thereby forwarding GLSurface methods through to it.
 class PassThroughImageTransportSurface
     : public gfx::GLSurfaceAdapter,
       public ImageTransportSurface {
  public:
   PassThroughImageTransportSurface(GpuChannelManager* manager,
-                                   int32 render_view_id,
-                                   int32 client_id,
-                                   int32 command_buffer_id,
+                                   GpuCommandBufferStub* stub,
                                    gfx::GLSurface* surface);
   virtual ~PassThroughImageTransportSurface();
 
   // 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;
 
   // 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:
   scoped_ptr<ImageTransportHelper> helper_;
 
   DISALLOW_COPY_AND_ASSIGN(PassThroughImageTransportSurface);
 };
 
 #endif  // defined(ENABLE_GPU)
 
 #endif  // CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_H_