Revert 113479 - Revert "Revert 113250 - Add CommandBuffer::SetGetBuffer"

content/renderer/gpu/command_buffer_proxy.h

Index: content/renderer/gpu/command_buffer_proxy.h
===================================================================
--- content/renderer/gpu/command_buffer_proxy.h	(revision 113511)
+++ content/renderer/gpu/command_buffer_proxy.h	(working copy)
@@ -43,12 +43,13 @@
   int route_id() const { return route_id_; }
 
   // CommandBuffer implementation:
-  virtual bool Initialize() OVERRIDE;
+  virtual bool Initialize(int32 size) OVERRIDE;
+  virtual bool Initialize(base::SharedMemory* buffer, int32 size) OVERRIDE;
+  virtual gpu::Buffer GetRingBuffer() OVERRIDE;
   virtual State GetState() OVERRIDE;
   virtual State GetLastState() OVERRIDE;
   virtual void Flush(int32 put_offset) OVERRIDE;
   virtual State FlushSync(int32 put_offset, int32 last_known_get) OVERRIDE;
-  virtual void SetGetBuffer(int32 shm_id) OVERRIDE;
   virtual void SetGetOffset(int32 get_offset) OVERRIDE;
   virtual int32 CreateTransferBuffer(size_t size, int32 id_request) OVERRIDE;
   virtual int32 RegisterTransferBuffer(base::SharedMemory* shared_memory,
@@ -103,6 +104,10 @@
   void OnDestroyed(gpu::error::ContextLostReason reason);
   void OnEchoAck();
 
+  // As with the service, the client takes ownership of the ring buffer.
+  int32 num_entries_;
+  scoped_ptr<base::SharedMemory> ring_buffer_;
+
   // Local cache of id to transfer buffer mapping.
   typedef std::map<int32, gpu::Buffer> TransferBufferMap;
   TransferBufferMap transfer_buffers_;