Implement TextureImageTransportSurface using texture mailbox

content/common/gpu/texture_image_transport_surface.h

Index: content/common/gpu/texture_image_transport_surface.h
diff --git a/content/common/gpu/texture_image_transport_surface.h b/content/common/gpu/texture_image_transport_surface.h
index 0d19d0fc6f3fb516f07e8177fe911335387dc015..8600c9b1f28d63cebe94a3b73543cc225a54cac6 100644
--- a/content/common/gpu/texture_image_transport_surface.h
+++ b/content/common/gpu/texture_image_transport_surface.h
@@ -6,9 +6,9 @@
 #define CONTENT_COMMON_GPU_TEXTURE_IMAGE_TRANSPORT_SURFACE_H_
 
 #include "base/basictypes.h"
-#include "base/memory/weak_ptr.h"
 #include "content/common/gpu/gpu_command_buffer_stub.h"
 #include "content/common/gpu/image_transport_surface.h"
+#include "gpu/command_buffer/service/mailbox_manager.h"
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "ui/gl/gl_surface.h"
 
@@ -18,8 +18,7 @@ class GpuChannelManager;
 class TextureImageTransportSurface :
     public ImageTransportSurface,
     public GpuCommandBufferStub::DestructionObserver,
-    public gfx::GLSurface,
-    public base::SupportsWeakPtr<TextureImageTransportSurface> {
+    public gfx::GLSurface {
  public:
   TextureImageTransportSurface(GpuChannelManager* manager,
                                GpuCommandBufferStub* stub,
@@ -50,54 +49,43 @@ class TextureImageTransportSurface :
   virtual void OnBufferPresented(
       uint32 sync_point) OVERRIDE;
   virtual void OnResizeViewACK() OVERRIDE;
-  virtual void OnSetFrontSurfaceIsProtected(
-      bool is_protected,
-      uint32 protection_state_id) OVERRIDE;
   virtual void OnResize(gfx::Size size) OVERRIDE;
 
   // GpuCommandBufferStub::DestructionObserver implementation.
   virtual void OnWillDestroyStub(GpuCommandBufferStub* stub) OVERRIDE;
 
  private:
-  // A texture backing the front/back buffer in the parent stub.
+  // A texture backing the front/back buffer.
   struct Texture {
     Texture();
     ~Texture();
 
-    // The client-side id in the parent stub.
-    uint32 client_id;
-
     // The currently allocated size.
     gfx::Size size;
 
-    // Whether or not that texture has been sent to the client yet.
-    bool sent_to_client;
-
-    // The texture info in the parent stub.
-    gpu::gles2::TextureManager::TextureInfo::Ref info;
+    // The actual GL texture id.
+    uint32 service_id;
   };
 
   virtual ~TextureImageTransportSurface();
-  void CreateBackTexture(const gfx::Size& size);
+  void CreateBackTexture();
   void AttachBackTextureToFBO();
-  void ReleaseTexture(int id);
-  void ReleaseParentStub();
+  void ReleaseBackBuffer();
   void AdjustFrontBufferAllocation();
   void BufferPresentedImpl();
-  int front() const { return front_; }
-  int back() const { return 1 - front_; }
+  void ProduceTexture(Texture& texture);
+  void ConsumeTexture(Texture& texture);
 
   // The framebuffer that represents this surface (service id). Allocated lazily
   // in OnMakeCurrent.
   uint32 fbo_id_;
 
-  // The front and back buffers.
-  Texture textures_[2];
+  // The current backbuffer
+  Texture backbuffer_;
 
-  gfx::Rect previous_damage_rect_;
+  gfx::Size current_size_;
 
-  // Indicates which of the 2 above is the front buffer.
-  int front_;
+  gfx::Rect previous_damage_rect_;
 
   // Whether or not the command buffer stub has been destroyed.
   bool stub_destroyed_;
@@ -105,12 +93,8 @@ class TextureImageTransportSurface :
   bool backbuffer_suggested_allocation_;
   bool frontbuffer_suggested_allocation_;
 
-  bool frontbuffer_is_protected_;
-  uint32 protection_state_id_;
-
   scoped_ptr<ImageTransportHelper> helper_;
   gfx::GLSurfaceHandle handle_;
-  GpuCommandBufferStub* parent_stub_;
 
   // The offscreen surface used to make the context current. However note that
   // the actual rendering is always redirected to an FBO.
@@ -122,6 +106,12 @@ class TextureImageTransportSurface :
   // Whether we unscheduled command buffer because of pending SwapBuffers.
   bool did_unschedule_;
 
+  // The mailbox name used for texture exchange.
+  gpu::gles2::MailboxName mailbox_name_;
+
+  // Holds a reference to the mailbox manager for cleanup.
+  scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_;
+
   DISALLOW_COPY_AND_ASSIGN(TextureImageTransportSurface);
 };