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

content/renderer/gpu/command_buffer_proxy.h

 // 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.
 
 #ifndef CONTENT_RENDERER_GPU_COMMAND_BUFFER_PROXY_H_
 #define CONTENT_RENDERER_GPU_COMMAND_BUFFER_PROXY_H_
 #pragma once
 
 #if defined(ENABLE_GPU)
 
@@ skipping 25 matching lines @@
   CommandBufferProxy(GpuChannelHost* channel, int route_id);
   virtual ~CommandBufferProxy();
 
   // IPC::Channel::Listener implementation:
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void OnChannelError() OVERRIDE;
 
   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,
                                        size_t size,
                                        int32 id_request) OVERRIDE;
   virtual void DestroyTransferBuffer(int32 id) OVERRIDE;
   virtual gpu::Buffer GetTransferBuffer(int32 handle) OVERRIDE;
   virtual void SetToken(int32 token) OVERRIDE;
   virtual void SetParseError(gpu::error::Error error) OVERRIDE;
   virtual void SetContextLostReason(
@@ skipping 34 matching lines @@
   // encapsulate the channel; all callers of this function must explicitly
   // verify that the context has not been lost.
   bool Send(IPC::Message* msg);
 
   // Message handlers:
   void OnUpdateState(const gpu::CommandBuffer::State& state);
   void OnNotifyRepaint();
   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_;
 
   // Zero or more video decoder hosts owned by this proxy, keyed by their
   // decoder_route_id.
   typedef std::map<int, scoped_refptr<GpuVideoDecodeAcceleratorHost> > Decoders;
   Decoders video_decoder_hosts_;
 
   // The last cached state received from the service.
@@ skipping 11 matching lines @@
   base::Closure notify_repaint_task_;
 
   base::Closure channel_error_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(CommandBufferProxy);
 };
 
 #endif  // ENABLE_GPU
 
 #endif  // CONTENT_RENDERER_GPU_COMMAND_BUFFER_PROXY_H_