| Index: mojo/services/gles2/command_buffer_impl.h
|
| diff --git a/mojo/services/gles2/command_buffer_impl.h b/mojo/services/gles2/command_buffer_impl.h
|
| index 3a461e5e7c7db4e17442ad414db25e71be290cf3..2f28e6b884aca8a19c582d22270453f8762368e1 100644
|
| --- a/mojo/services/gles2/command_buffer_impl.h
|
| +++ b/mojo/services/gles2/command_buffer_impl.h
|
| @@ -7,7 +7,6 @@
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/timer/timer.h"
|
| -#include "mojo/public/cpp/bindings/remote_ptr.h"
|
| #include "mojo/public/cpp/system/core.h"
|
| #include "mojo/services/gles2/command_buffer.mojom.h"
|
| #include "ui/gfx/native_widget_types.h"
|
| @@ -27,12 +26,12 @@ namespace services {
|
|
|
| class CommandBufferImpl : public CommandBuffer {
|
| public:
|
| - CommandBufferImpl(ScopedCommandBufferClientHandle client,
|
| - gfx::AcceleratedWidget widget,
|
| + CommandBufferImpl(gfx::AcceleratedWidget widget,
|
| const gfx::Size& size);
|
| virtual ~CommandBufferImpl();
|
|
|
| - virtual void Initialize(ScopedCommandBufferSyncClientHandle sync_client,
|
| + virtual void SetClient(CommandBufferClient* client) OVERRIDE;
|
| + virtual void Initialize(CommandBufferSyncClientPtr sync_client,
|
| mojo::ScopedSharedBufferHandle shared_state) OVERRIDE;
|
| virtual void SetGetBuffer(int32_t buffer) OVERRIDE;
|
| virtual void Flush(int32_t put_offset) OVERRIDE;
|
| @@ -54,8 +53,8 @@ class CommandBufferImpl : public CommandBuffer {
|
|
|
| void DrawAnimationFrame();
|
|
|
| - RemotePtr<CommandBufferClient> client_;
|
| - RemotePtr<CommandBufferSyncClient> sync_client_;
|
| + CommandBufferClient* client_;
|
| + CommandBufferSyncClientPtr sync_client_;
|
|
|
| gfx::AcceleratedWidget widget_;
|
| gfx::Size size_;
|
|
|