Mojo: Replace RemotePtr with InterfacePtr and InterfaceImpl

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"
@@ skipping 32 matching lines @@
 }
 
 CommandBufferDelegate::~CommandBufferDelegate() {}
 
 void CommandBufferDelegate::ContextLost() {}
 void CommandBufferDelegate::DrawAnimationFrame() {}
 
 CommandBufferClientImpl::CommandBufferClientImpl(
     CommandBufferDelegate* delegate,
     MojoAsyncWaiter* async_waiter,
-    ScopedCommandBufferHandle command_buffer_handle)
+    ScopedMessagePipeHandle command_buffer_handle)
     : delegate_(delegate),
-      command_buffer_(command_buffer_handle.Pass(), this, this, async_waiter),
+      command_buffer_(MakeProxy<mojo::CommandBuffer>(
+          command_buffer_handle.Pass(), async_waiter)),
       shared_state_(NULL),
       last_put_offset_(-1),
       next_transfer_buffer_id_(0),
-      initialize_result_(false) {}
+      initialize_result_(false) {
+  command_buffer_.set_error_handler(this);
+  command_buffer_->SetClient(this);
+}
 
 CommandBufferClientImpl::~CommandBufferClientImpl() {}
 
 bool CommandBufferClientImpl::Initialize() {
   const size_t kSharedStateSize = sizeof(gpu::CommandBufferSharedState);
   void* memory = NULL;
   mojo::ScopedSharedBufferHandle duped;
   bool result = CreateMapAndDupSharedBuffer(
       kSharedStateSize, &memory, &shared_state_handle_, &duped);
   if (!result)
     return false;
 
   shared_state_ = static_cast<gpu::CommandBufferSharedState*>(memory);
 
   shared_state()->Initialize();
 
-  InterfacePipe<CommandBufferSyncClient, NoInterface> sync_pipe;
+  // TODO(darin): We need better sugar for sync calls.
+  MessagePipe sync_pipe;
   sync_dispatcher_.reset(new SyncDispatcher<CommandBufferSyncClient>(
-      sync_pipe.handle_to_peer.Pass(), this));
+      sync_pipe.handle0.Pass(), this));
+  CommandBufferSyncClientPtr sync_client =
+      MakeProxy<CommandBufferSyncClient>(sync_pipe.handle1.Pass());
   AllocationScope scope;
-  command_buffer_->Initialize(sync_pipe.handle_to_self.Pass(), duped.Pass());
+  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() {
   return last_state_;
@@ skipping 145 matching lines @@
   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);
   delegate_->ContextLost();
 }
 
-void CommandBufferClientImpl::OnError() { LostContext(gpu::error::kUnknown); }
+void CommandBufferClientImpl::OnConnectionError() {
+  LostContext(gpu::error::kUnknown);
+}
 
 void CommandBufferClientImpl::TryUpdateState() {
   if (last_state_.error == gpu::error::kNoError)
     shared_state()->Read(&last_state_);
 }
 
 void CommandBufferClientImpl::MakeProgressAndUpdateState() {
   command_buffer_->MakeProgress(last_state_.get_offset);
   if (!sync_dispatcher_->WaitAndDispatchOneMessage()) {
     VLOG(1) << "Channel encountered error while waiting for command buffer";
     // TODO(piman): is it ok for this to re-enter?
     DidDestroy();
     return;
   }
 }
 
 void CommandBufferClientImpl::DrawAnimationFrame() {
   delegate_->DrawAnimationFrame();
 }
 
 }  // namespace gles2
 }  // namespace mojo