| Index: content/common/gpu/gpu_command_buffer_stub.cc
|
| diff --git a/content/common/gpu/gpu_command_buffer_stub.cc b/content/common/gpu/gpu_command_buffer_stub.cc
|
| index af478e08dc35a311685a08db18deffc925283ede..6a8b4af02fc3f8b37163e9b8bb99d5a4c4939aa3 100644
|
| --- a/content/common/gpu/gpu_command_buffer_stub.cc
|
| +++ b/content/common/gpu/gpu_command_buffer_stub.cc
|
| @@ -87,6 +87,8 @@ bool GpuCommandBufferStub::OnMessageReceived(const IPC::Message& message) {
|
| IPC_BEGIN_MESSAGE_MAP(GpuCommandBufferStub, message)
|
| IPC_MESSAGE_HANDLER_DELAY_REPLY(GpuCommandBufferMsg_Initialize,
|
| OnInitialize);
|
| + IPC_MESSAGE_HANDLER_DELAY_REPLY(GpuCommandBufferMsg_SetGetBuffer,
|
| + OnSetGetBuffer);
|
| IPC_MESSAGE_HANDLER_DELAY_REPLY(GpuCommandBufferMsg_SetParent,
|
| OnSetParent);
|
| IPC_MESSAGE_HANDLER_DELAY_REPLY(GpuCommandBufferMsg_GetState, OnGetState);
|
| @@ -159,8 +161,6 @@ void GpuCommandBufferStub::OnInitializeFailed(IPC::Message* reply_message) {
|
| }
|
|
|
| void GpuCommandBufferStub::OnInitialize(
|
| - base::SharedMemoryHandle ring_buffer,
|
| - int32 size,
|
| IPC::Message* reply_message) {
|
| DCHECK(!command_buffer_.get());
|
|
|
| @@ -168,19 +168,7 @@ void GpuCommandBufferStub::OnInitialize(
|
|
|
| command_buffer_.reset(new gpu::CommandBufferService);
|
|
|
| -#if defined(OS_WIN)
|
| - // Windows dups the shared memory handle it receives into the current process
|
| - // and closes it when this variable goes out of scope.
|
| - base::SharedMemory shared_memory(ring_buffer,
|
| - false,
|
| - channel_->renderer_process());
|
| -#else
|
| - // POSIX receives a dup of the shared memory handle and closes the dup when
|
| - // this variable goes out of scope.
|
| - base::SharedMemory shared_memory(ring_buffer, false);
|
| -#endif
|
| -
|
| - if (!command_buffer_->Initialize(&shared_memory, size)) {
|
| + if (!command_buffer_->Initialize()) {
|
| DLOG(ERROR) << "CommandBufferService failed to initialize.\n";
|
| OnInitializeFailed(reply_message);
|
| return;
|
| @@ -287,6 +275,12 @@ void GpuCommandBufferStub::OnInitialize(
|
| "offscreen", surface_->IsOffscreen());
|
| }
|
|
|
| +void GpuCommandBufferStub::OnSetGetBuffer(
|
| + int32 shm_id, IPC::Message* reply_message) {
|
| + scheduler_->SetGetBuffer(shm_id);
|
| + Send(reply_message);
|
| +}
|
| +
|
| void GpuCommandBufferStub::OnSetParent(int32 parent_route_id,
|
| uint32 parent_texture_id,
|
| IPC::Message* reply_message) {
|
|
|