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

ppapi/proxy/ppb_graphics_3d_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 PPAPI_PROXY_PPB_GRAPHICS_3D_PROXY_H_
 #define PPAPI_PROXY_PPB_GRAPHICS_3D_PROXY_H_
 
 #include <vector>
 
 #include "base/shared_memory.h"
@@ skipping 18 matching lines @@
   virtual ~Graphics3D();
 
   bool Init();
 
   // Resource overrides.
   virtual thunk::PPB_Graphics3D_API* AsPPB_Graphics3D_API() OVERRIDE {
     return this;
   }
 
   // Graphics3DTrusted API. These are not implemented in the proxy.
-  virtual PP_Bool InitCommandBuffer(int32_t size) OVERRIDE;
-  virtual PP_Bool GetRingBuffer(int* shm_handle, uint32_t* shm_size) OVERRIDE;
+  virtual PP_Bool InitCommandBuffer() OVERRIDE;
+  virtual PP_Bool SetGetBuffer(int32_t shm_id) OVERRIDE;
   virtual PP_Graphics3DTrustedState GetState() OVERRIDE;
   virtual PP_Bool Flush(int32_t put_offset) OVERRIDE;
   virtual PP_Graphics3DTrustedState FlushSync(int32_t put_offset) OVERRIDE;
   virtual int32_t CreateTransferBuffer(uint32_t size) OVERRIDE;
   virtual PP_Bool DestroyTransferBuffer(int32_t id) OVERRIDE;
   virtual PP_Bool GetTransferBuffer(int32_t id,
                                     int* shm_handle,
                                     uint32_t* shm_size) OVERRIDE;
   virtual PP_Graphics3DTrustedState FlushSyncFast(
       int32_t put_offset,
@@ skipping 21 matching lines @@
 
   // InterfaceProxy implementation.
   virtual bool OnMessageReceived(const IPC::Message& msg);
 
   static const ApiID kApiID = API_ID_PPB_GRAPHICS_3D;
 
  private:
   void OnMsgCreate(PP_Instance instance,
                    const std::vector<int32_t>& attribs,
                    HostResource* result);
-  void OnMsgInitCommandBuffer(const HostResource& context,
-                              int32 size,
-                              base::SharedMemoryHandle* ring_buffer);
+  void OnMsgInitCommandBuffer(const HostResource& context);
+  void OnMsgSetGetBuffer(const HostResource& context,
+                         int32 id);
   void OnMsgGetState(const HostResource& context,
                      gpu::CommandBuffer::State* state);
   void OnMsgFlush(const HostResource& context,
                   int32 put_offset,
                   int32 last_known_get,
                   gpu::CommandBuffer::State* state);
   void OnMsgAsyncFlush(const HostResource& context,
                        int32 put_offset);
   void OnMsgCreateTransferBuffer(const HostResource& context,
                                  int32 size,
@@ skipping 16 matching lines @@
                                 ProxyNonThreadSafeRefCount> callback_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PPB_Graphics3D_Proxy);
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
 #endif  // PPAPI_PROXY_PPB_GRAPHICS_3D_PROXY_H_