| Index: gpu/ipc/service/gpu_command_buffer_stub.cc
|
| diff --git a/gpu/ipc/service/gpu_command_buffer_stub.cc b/gpu/ipc/service/gpu_command_buffer_stub.cc
|
| index c533a6f460f1bb370d39b1f44d3c701ddc09b9d1..9ed1004a053ffef38a13c386d8b37ee132578f18 100644
|
| --- a/gpu/ipc/service/gpu_command_buffer_stub.cc
|
| +++ b/gpu/ipc/service/gpu_command_buffer_stub.cc
|
| @@ -294,8 +294,9 @@ bool GpuCommandBufferStub::OnMessageReceived(const IPC::Message& message) {
|
| OnInitialize);
|
| IPC_MESSAGE_HANDLER_DELAY_REPLY(GpuCommandBufferMsg_SetGetBuffer,
|
| OnSetGetBuffer);
|
| - IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_ProduceFrontBuffer,
|
| - OnProduceFrontBuffer);
|
| + IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_TakeFrontBuffer, OnTakeFrontBuffer);
|
| + IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_ReturnFrontBuffer,
|
| + OnReturnFrontBuffer);
|
| IPC_MESSAGE_HANDLER_DELAY_REPLY(GpuCommandBufferMsg_WaitForTokenInRange,
|
| OnWaitForTokenInRange);
|
| IPC_MESSAGE_HANDLER_DELAY_REPLY(GpuCommandBufferMsg_WaitForGetOffsetInRange,
|
| @@ -707,14 +708,22 @@ void GpuCommandBufferStub::OnSetGetBuffer(int32_t shm_id,
|
| Send(reply_message);
|
| }
|
|
|
| -void GpuCommandBufferStub::OnProduceFrontBuffer(const Mailbox& mailbox) {
|
| - TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnProduceFrontBuffer");
|
| +void GpuCommandBufferStub::OnTakeFrontBuffer(const Mailbox& mailbox) {
|
| + TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnTakeFrontBuffer");
|
| if (!decoder_) {
|
| - LOG(ERROR) << "Can't produce front buffer before initialization.";
|
| + LOG(ERROR) << "Can't take front buffer before initialization.";
|
| return;
|
| }
|
|
|
| - decoder_->ProduceFrontBuffer(mailbox);
|
| + decoder_->TakeFrontBuffer(mailbox);
|
| +}
|
| +
|
| +void GpuCommandBufferStub::OnReturnFrontBuffer(const Mailbox& mailbox,
|
| + const SyncToken& sync_token,
|
| + bool is_lost) {
|
| + OnWaitFenceSync(sync_token.namespace_id(), sync_token.command_buffer_id(),
|
| + sync_token.release_count());
|
| + decoder_->ReturnFrontBuffer(mailbox, is_lost);
|
| }
|
|
|
| void GpuCommandBufferStub::OnParseError() {
|
|
|