| Index: mojo/gles2/command_buffer_client_impl.h
|
| diff --git a/mojo/gles2/command_buffer_client_impl.h b/mojo/gles2/command_buffer_client_impl.h
|
| index c867e4df2c55d80c6763f0b667665af3c9e21aee..5b6752446c37321c9526dee0e2b06ec72327f680 100644
|
| --- a/mojo/gles2/command_buffer_client_impl.h
|
| +++ b/mojo/gles2/command_buffer_client_impl.h
|
| @@ -13,7 +13,6 @@
|
| #include "gpu/command_buffer/common/command_buffer.h"
|
| #include "gpu/command_buffer/common/command_buffer_shared.h"
|
| #include "mojo/public/cpp/bindings/error_handler.h"
|
| -#include "mojo/public/cpp/bindings/remote_ptr.h"
|
| #include "mojo/services/gles2/command_buffer.mojom.h"
|
|
|
| namespace base {
|
| @@ -43,7 +42,7 @@ class CommandBufferClientImpl : public CommandBufferClient,
|
| explicit CommandBufferClientImpl(
|
| CommandBufferDelegate* delegate,
|
| MojoAsyncWaiter* async_waiter,
|
| - ScopedCommandBufferHandle command_buffer_handle);
|
| + ScopedMessagePipeHandle command_buffer_handle);
|
| virtual ~CommandBufferClientImpl();
|
|
|
| // CommandBuffer implementation:
|
| @@ -88,7 +87,7 @@ class CommandBufferClientImpl : public CommandBufferClient,
|
| virtual void LostContext(int32_t lost_reason) OVERRIDE;
|
|
|
| // ErrorHandler implementation:
|
| - virtual void OnError() OVERRIDE;
|
| + virtual void OnConnectionError() OVERRIDE;
|
|
|
| virtual void DrawAnimationFrame() OVERRIDE;
|
|
|
| @@ -98,7 +97,7 @@ class CommandBufferClientImpl : public CommandBufferClient,
|
| gpu::CommandBufferSharedState* shared_state() const { return shared_state_; }
|
|
|
| CommandBufferDelegate* delegate_;
|
| - RemotePtr<mojo::CommandBuffer> command_buffer_;
|
| + CommandBufferPtr command_buffer_;
|
| scoped_ptr<SyncDispatcher<CommandBufferSyncClient> > sync_dispatcher_;
|
|
|
| State last_state_;
|
|
|