Mojo: more idiomatic C++ bindings

mojo/gles2/command_buffer_client_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/gles2/command_buffer_client_impl.h"
 
 #include <limits>
 
 #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"
 
 namespace mojo {
 namespace gles2 {
 
 namespace {
 
 bool CreateMapAndDupSharedBuffer(size_t size,
@@ skipping 56 matching lines @@
 
   shared_state()->Initialize();
 
   // TODO(darin): We need better sugar for sync calls.
   MessagePipe sync_pipe;
   sync_dispatcher_.reset(new SyncDispatcher<CommandBufferSyncClient>(
       sync_pipe.handle0.Pass(), this));
   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()) {
     VLOG(1) << "Channel encountered error while creating command buffer";
     return false;
   }
   return initialize_result_;
 }
 
 gpu::CommandBuffer::State CommandBufferClientImpl::GetLastState() {
@@ skipping 43 matching lines @@
     return NULL;
 
   void* memory = NULL;
   mojo::ScopedSharedBufferHandle handle;
   mojo::ScopedSharedBufferHandle duped;
   if (!CreateMapAndDupSharedBuffer(size, &memory, &handle, &duped))
     return NULL;
 
   *id = ++next_transfer_buffer_id_;
 
-  AllocationScope scope;
   command_buffer_->RegisterTransferBuffer(
       *id, duped.Pass(), static_cast<uint32_t>(size));
 
   scoped_ptr<gpu::BufferBacking> backing(
       new MojoBufferBacking(handle.Pass(), memory, size));
   scoped_refptr<gpu::Buffer> buffer(new gpu::Buffer(backing.Pass()));
   return buffer;
 }
 
 void CommandBufferClientImpl::DestroyTransferBuffer(int32 id) {
@@ skipping 66 matching lines @@
 }
 
 void CommandBufferClientImpl::CancelAnimationFrames() {
   command_buffer_->CancelAnimationFrames();
 }
 
 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() {
   LostContext(gpu::error::kUnknown);
 }
 
 void CommandBufferClientImpl::LostContext(int32_t lost_reason) {
   last_state_.error = gpu::error::kLostContext;
   last_state_.context_lost_reason =
       static_cast<gpu::error::ContextLostReason>(lost_reason);
@@ skipping 18 matching lines @@
     return;
   }
 }
 
 void CommandBufferClientImpl::DrawAnimationFrame() {
   delegate_->DrawAnimationFrame();
 }
 
 }  // namespace gles2
 }  // namespace mojo