diff options
| author | rsimha@google.com <rsimha@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-08 00:18:25 +0000 |
|---|---|---|
| committer | rsimha@google.com <rsimha@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-08 00:18:25 +0000 |
| commit | 84677847c10d0319d8d996aea9b310add85c0bd3 (patch) | |
| tree | 12eceac742ce01154307bd86f28e8d87e95cf07a /ppapi/proxy/ppb_graphics_3d_proxy.h | |
| parent | 973d44a198f2fa9314ecbe43b06f0a7d622dfc7e (diff) | |
| download | chromium_src-84677847c10d0319d8d996aea9b310add85c0bd3.zip chromium_src-84677847c10d0319d8d996aea9b310add85c0bd3.tar.gz chromium_src-84677847c10d0319d8d996aea9b310add85c0bd3.tar.bz2 | |
Revert 113479 - Revert "Revert 113250 - Add CommandBuffer::SetGetBuffer"
Reason for revert: Bot redness. See http://build.chromium.org/p/chromium/builders/Mac10.6%20Tests%20%281%29/builds/15717
Original checkin notes:
This reverts commit bd45bd252aeb8babac62547a5c605fbf64287cd3.
TEST=ran webkit tests in DRT and webgl tests in chrome
BUG=103989
Review URL: http://codereview.chromium.org/8758026
TBR=gman@chromium.org
Review URL: http://codereview.chromium.org/8865008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113512 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppb_graphics_3d_proxy.h')
| -rw-r--r-- | ppapi/proxy/ppb_graphics_3d_proxy.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ppapi/proxy/ppb_graphics_3d_proxy.h b/ppapi/proxy/ppb_graphics_3d_proxy.h index 5a6c334..887ae46 100644 --- a/ppapi/proxy/ppb_graphics_3d_proxy.h +++ b/ppapi/proxy/ppb_graphics_3d_proxy.h @@ -36,8 +36,8 @@ class Graphics3D : public Resource, public PPB_Graphics3D_Shared { } // Graphics3DTrusted API. These are not implemented in the proxy. - virtual PP_Bool InitCommandBuffer() OVERRIDE; - virtual PP_Bool SetGetBuffer(int32_t shm_id) OVERRIDE; + virtual PP_Bool InitCommandBuffer(int32_t size) OVERRIDE; + virtual PP_Bool GetRingBuffer(int* shm_handle, uint32_t* shm_size) OVERRIDE; virtual PP_Graphics3DTrustedState GetState() OVERRIDE; virtual PP_Bool Flush(int32_t put_offset) OVERRIDE; virtual PP_Graphics3DTrustedState FlushSync(int32_t put_offset) OVERRIDE; @@ -79,9 +79,9 @@ class PPB_Graphics3D_Proxy : public InterfaceProxy { void OnMsgCreate(PP_Instance instance, const std::vector<int32_t>& attribs, HostResource* result); - void OnMsgInitCommandBuffer(const HostResource& context); - void OnMsgSetGetBuffer(const HostResource& context, - int32 id); + void OnMsgInitCommandBuffer(const HostResource& context, + int32 size, + base::SharedMemoryHandle* ring_buffer); void OnMsgGetState(const HostResource& context, gpu::CommandBuffer::State* state); void OnMsgFlush(const HostResource& context, |