| 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 47b1e0a09219d1a59f86ebc6db2539439ae417fe..907108cf313af5adfb39c700e59cdc470523852f 100644
|
| --- a/mojo/gles2/command_buffer_client_impl.h
|
| +++ b/mojo/gles2/command_buffer_client_impl.h
|
| @@ -7,14 +7,14 @@
|
|
|
| #include <map>
|
|
|
| +#include "mojo/services/gles2/command_buffer.mojom.h"
|
| +
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "gpu/command_buffer/client/gpu_control.h"
|
| #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 {
|
| class RunLoop;
|
| @@ -43,7 +43,7 @@ class CommandBufferClientImpl : public CommandBufferClient,
|
| explicit CommandBufferClientImpl(
|
| CommandBufferDelegate* delegate,
|
| MojoAsyncWaiter* async_waiter,
|
| - ScopedCommandBufferHandle command_buffer_handle);
|
| + ScopedMessagePipeHandle command_buffer_handle);
|
| virtual ~CommandBufferClientImpl();
|
|
|
| // CommandBuffer implementation:
|
| @@ -97,8 +97,8 @@ class CommandBufferClientImpl : public CommandBufferClient,
|
| gpu::CommandBufferSharedState* shared_state() const { return shared_state_; }
|
|
|
| CommandBufferDelegate* delegate_;
|
| - RemotePtr<mojo::CommandBuffer> command_buffer_;
|
| - scoped_ptr<SyncDispatcher<CommandBufferSyncClient> > sync_dispatcher_;
|
| + CommandBufferPtr command_buffer_;
|
| + // XXX scoped_ptr<SyncDispatcher<CommandBufferSyncClient> > sync_dispatcher_;
|
|
|
| State last_state_;
|
| mojo::ScopedSharedBufferHandle shared_state_handle_;
|
|
|