| Index: services/gles2/command_buffer_impl.h
|
| diff --git a/services/gles2/command_buffer_impl.h b/services/gles2/command_buffer_impl.h
|
| index cb69fa29bcde6f79d669fc0471f8d1b14be717fc..def9f73ef4bb0167bb52b1e940c90053ed6ba63c 100644
|
| --- a/services/gles2/command_buffer_impl.h
|
| +++ b/services/gles2/command_buffer_impl.h
|
| @@ -16,55 +16,55 @@ namespace gpu {
|
| class SyncPointManager;
|
| }
|
|
|
| -namespace mojo {
|
| +namespace gles2 {
|
| class CommandBufferDriver;
|
|
|
| // This class listens to the CommandBuffer message pipe on a low-latency thread
|
| // so that we can insert sync points without blocking on the GL driver. It
|
| // forwards most method calls to the CommandBufferDriver, which runs on the
|
| // same thread as the native viewport.
|
| -class CommandBufferImpl : public CommandBuffer {
|
| +class CommandBufferImpl : public mojo::CommandBuffer {
|
| public:
|
| CommandBufferImpl(
|
| - InterfaceRequest<CommandBuffer> request,
|
| - ViewportParameterListenerPtr listener,
|
| + mojo::InterfaceRequest<CommandBuffer> request,
|
| + mojo::ViewportParameterListenerPtr listener,
|
| scoped_refptr<base::SingleThreadTaskRunner> control_task_runner,
|
| gpu::SyncPointManager* sync_point_manager,
|
| scoped_ptr<CommandBufferDriver> driver);
|
| ~CommandBufferImpl() override;
|
|
|
| - void Initialize(CommandBufferSyncClientPtr sync_client,
|
| - CommandBufferSyncPointClientPtr sync_point_client,
|
| - ScopedSharedBufferHandle shared_state) override;
|
| + void Initialize(mojo::CommandBufferSyncClientPtr sync_client,
|
| + mojo::CommandBufferSyncPointClientPtr sync_point_client,
|
| + mojo::ScopedSharedBufferHandle shared_state) override;
|
| void SetGetBuffer(int32_t buffer) override;
|
| void Flush(int32_t put_offset) override;
|
| void MakeProgress(int32_t last_get_offset) override;
|
| void RegisterTransferBuffer(int32_t id,
|
| - ScopedSharedBufferHandle transfer_buffer,
|
| + mojo::ScopedSharedBufferHandle transfer_buffer,
|
| uint32_t size) override;
|
| void DestroyTransferBuffer(int32_t id) override;
|
| void InsertSyncPoint(bool retire) override;
|
| void RetireSyncPoint(uint32_t sync_point) override;
|
| - void Echo(const Callback<void()>& callback) override;
|
| + void Echo(const mojo::Callback<void()>& callback) override;
|
|
|
| void LostContext(int32_t reason);
|
| void UpdateVSyncParameters(base::TimeTicks timebase,
|
| base::TimeDelta interval);
|
|
|
| private:
|
| - void BindToRequest(InterfaceRequest<CommandBuffer> request);
|
| + void BindToRequest(mojo::InterfaceRequest<CommandBuffer> request);
|
|
|
| scoped_refptr<gpu::SyncPointManager> sync_point_manager_;
|
| scoped_refptr<base::SingleThreadTaskRunner> driver_task_runner_;
|
| scoped_ptr<CommandBufferDriver> driver_;
|
| - CommandBufferSyncPointClientPtr sync_point_client_;
|
| - ViewportParameterListenerPtr viewport_parameter_listener_;
|
| - StrongBinding<CommandBuffer> binding_;
|
| + mojo::CommandBufferSyncPointClientPtr sync_point_client_;
|
| + mojo::ViewportParameterListenerPtr viewport_parameter_listener_;
|
| + mojo::StrongBinding<CommandBuffer> binding_;
|
|
|
| base::WeakPtrFactory<CommandBufferImpl> weak_factory_;
|
| DISALLOW_COPY_AND_ASSIGN(CommandBufferImpl);
|
| };
|
|
|
| -} // namespace mojo
|
| +} // namespace gles2
|
|
|
| #endif // SERVICES_GLES2_COMMAND_BUFFER_IMPL_H_
|
|
|