summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authorjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-12 20:09:57 +0000
committerjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-12 20:09:57 +0000
commitce9eea60c922efff7c680a7a127480a799e06e94 (patch)
tree6e34093d78d48fe4d1132c4d8eef2817d32e2203 /ppapi
parent8c3bd1d8c71d8432beb624ce1434ca962665de90 (diff)
downloadchromium_src-ce9eea60c922efff7c680a7a127480a799e06e94.zip
chromium_src-ce9eea60c922efff7c680a7a127480a799e06e94.tar.gz
chromium_src-ce9eea60c922efff7c680a7a127480a799e06e94.tar.bz2
implemented latch support in renderer process. this corresponds with a webkit patch.
https://bugs.webkit.org/show_bug.cgi?id=58003 BUG=72671 TEST=see attachment in bug for test. only green should be seen. Review URL: http://codereview.chromium.org/6810009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81295 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/proxy/ppb_context_3d_proxy.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/ppapi/proxy/ppb_context_3d_proxy.cc b/ppapi/proxy/ppb_context_3d_proxy.cc
index dcbe943..396ccf6 100644
--- a/ppapi/proxy/ppb_context_3d_proxy.cc
+++ b/ppapi/proxy/ppb_context_3d_proxy.cc
@@ -183,9 +183,10 @@ class PepperCommandBuffer : public gpu::CommandBuffer {
virtual void Flush(int32 put_offset);
virtual State FlushSync(int32 put_offset);
virtual void SetGetOffset(int32 get_offset);
- virtual int32 CreateTransferBuffer(size_t size);
+ virtual int32 CreateTransferBuffer(size_t size, int32 id_request);
virtual int32 RegisterTransferBuffer(base::SharedMemory* shared_memory,
- size_t size);
+ size_t size,
+ int32 id_request);
virtual void DestroyTransferBuffer(int32 id);
virtual gpu::Buffer GetTransferBuffer(int32 handle);
virtual void SetToken(int32 token);
@@ -303,7 +304,7 @@ void PepperCommandBuffer::SetGetOffset(int32 get_offset) {
NOTREACHED();
}
-int32 PepperCommandBuffer::CreateTransferBuffer(size_t size) {
+int32 PepperCommandBuffer::CreateTransferBuffer(size_t size, int32 id_request) {
if (last_state_.error == gpu::error::kNoError) {
int32 id;
if (Send(new PpapiHostMsg_PPBContext3D_CreateTransferBuffer(
@@ -317,7 +318,8 @@ int32 PepperCommandBuffer::CreateTransferBuffer(size_t size) {
int32 PepperCommandBuffer::RegisterTransferBuffer(
base::SharedMemory* shared_memory,
- size_t size) {
+ size_t size,
+ int32 id_request) {
// Not implemented in proxy.
NOTREACHED();
return -1;
@@ -425,7 +427,7 @@ bool Context3D::CreateImplementation() {
return false;
transfer_buffer_id_ =
- command_buffer_->CreateTransferBuffer(kTransferBufferSize);
+ command_buffer_->CreateTransferBuffer(kTransferBufferSize, -1);
if (transfer_buffer_id_ < 0)
return false;