| Index: mojo/gles2/command_buffer_client_impl.cc
|
| diff --git a/mojo/gles2/command_buffer_client_impl.cc b/mojo/gles2/command_buffer_client_impl.cc
|
| index a8c457150d0f07477712a6d72cdf6ab89f084c31..c40f82b29acf3f6ea63b0d0e946546f13376c0b2 100644
|
| --- a/mojo/gles2/command_buffer_client_impl.cc
|
| +++ b/mojo/gles2/command_buffer_client_impl.cc
|
| @@ -8,7 +8,6 @@
|
|
|
| #include "base/logging.h"
|
| #include "base/process/process_handle.h"
|
| -#include "mojo/public/cpp/bindings/allocation_scope.h"
|
| #include "mojo/public/cpp/bindings/sync_dispatcher.h"
|
| #include "mojo/services/gles2/command_buffer_type_conversions.h"
|
| #include "mojo/services/gles2/mojo_buffer_backing.h"
|
| @@ -85,7 +84,6 @@ bool CommandBufferClientImpl::Initialize() {
|
| CommandBufferSyncClientPtr sync_client =
|
| MakeProxy<CommandBufferSyncClient>(sync_pipe.handle1.Pass(),
|
| async_waiter_);
|
| - AllocationScope scope;
|
| command_buffer_->Initialize(sync_client.Pass(), duped.Pass());
|
| // Wait for DidInitialize to come on the sync client pipe.
|
| if (!sync_dispatcher_->WaitAndDispatchOneMessage()) {
|
| @@ -149,7 +147,6 @@ scoped_refptr<gpu::Buffer> CommandBufferClientImpl::CreateTransferBuffer(
|
|
|
| *id = ++next_transfer_buffer_id_;
|
|
|
| - AllocationScope scope;
|
| command_buffer_->RegisterTransferBuffer(
|
| *id, duped.Pass(), static_cast<uint32_t>(size));
|
|
|
| @@ -236,9 +233,9 @@ void CommandBufferClientImpl::DidInitialize(bool success) {
|
| initialize_result_ = success;
|
| }
|
|
|
| -void CommandBufferClientImpl::DidMakeProgress(const CommandBufferState& state) {
|
| - if (state.generation() - last_state_.generation < 0x80000000U)
|
| - last_state_ = state;
|
| +void CommandBufferClientImpl::DidMakeProgress(CommandBufferStatePtr state) {
|
| + if (state->generation - last_state_.generation < 0x80000000U)
|
| + last_state_ = state.To<State>();
|
| }
|
|
|
| void CommandBufferClientImpl::DidDestroy() {
|
|
|