| 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 6d05eb53faee17c4bfaeaeb2d52b838ee8f6ea2a..7f4d112a4f542a90d29cf79d325a6b61e534a034 100644
|
| --- a/gpu/ipc/service/gpu_command_buffer_stub.cc
|
| +++ b/gpu/ipc/service/gpu_command_buffer_stub.cc
|
| @@ -295,8 +295,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,
|
| @@ -306,6 +307,8 @@ bool GpuCommandBufferStub::OnMessageReceived(const IPC::Message& message) {
|
| OnRegisterTransferBuffer);
|
| IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_DestroyTransferBuffer,
|
| OnDestroyTransferBuffer);
|
| + IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_WaitSyncToken,
|
| + OnWaitSyncToken)
|
| IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_SignalSyncToken,
|
| OnSignalSyncToken)
|
| IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_SignalQuery,
|
| @@ -711,14 +714,19 @@ 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,
|
| + bool is_lost) {
|
| + decoder_->ReturnFrontBuffer(mailbox, is_lost);
|
| }
|
|
|
| void GpuCommandBufferStub::OnParseError() {
|
| @@ -883,6 +891,11 @@ void GpuCommandBufferStub::PullTextureUpdates(
|
| }
|
| }
|
|
|
| +void GpuCommandBufferStub::OnWaitSyncToken(const SyncToken& sync_token) {
|
| + OnWaitFenceSync(sync_token.namespace_id(), sync_token.command_buffer_id(),
|
| + sync_token.release_count());
|
| +}
|
| +
|
| void GpuCommandBufferStub::OnSignalSyncToken(const SyncToken& sync_token,
|
| uint32_t id) {
|
| scoped_refptr<SyncPointClientState> release_state =
|
|
|