| 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 5e6ffe1ffa832234f8eac77629f950ece3c1791f..297cb4208010e1e64b893a1b6325c5db20130052 100644
|
| --- a/mojo/gles2/command_buffer_client_impl.h
|
| +++ b/mojo/gles2/command_buffer_client_impl.h
|
| @@ -38,50 +38,49 @@ class CommandBufferClientImpl : public CommandBufferClient,
|
| CommandBufferDelegate* delegate,
|
| const MojoAsyncWaiter* async_waiter,
|
| ScopedMessagePipeHandle command_buffer_handle);
|
| - virtual ~CommandBufferClientImpl();
|
| + ~CommandBufferClientImpl() override;
|
|
|
| // CommandBuffer implementation:
|
| - virtual bool Initialize() override;
|
| - virtual State GetLastState() override;
|
| - virtual int32 GetLastToken() override;
|
| - virtual void Flush(int32 put_offset) override;
|
| - virtual void WaitForTokenInRange(int32 start, int32 end) override;
|
| - virtual void WaitForGetOffsetInRange(int32 start, int32 end) override;
|
| - virtual void SetGetBuffer(int32 shm_id) override;
|
| - virtual scoped_refptr<gpu::Buffer> CreateTransferBuffer(size_t size,
|
| - int32* id) override;
|
| - virtual void DestroyTransferBuffer(int32 id) override;
|
| + bool Initialize() override;
|
| + State GetLastState() override;
|
| + int32 GetLastToken() override;
|
| + void Flush(int32 put_offset) override;
|
| + void WaitForTokenInRange(int32 start, int32 end) override;
|
| + void WaitForGetOffsetInRange(int32 start, int32 end) override;
|
| + void SetGetBuffer(int32 shm_id) override;
|
| + scoped_refptr<gpu::Buffer> CreateTransferBuffer(size_t size,
|
| + int32* id) override;
|
| + void DestroyTransferBuffer(int32 id) override;
|
|
|
| // gpu::GpuControl implementation:
|
| - virtual gpu::Capabilities GetCapabilities() override;
|
| - virtual int32_t CreateImage(ClientBuffer buffer,
|
| - size_t width,
|
| - size_t height,
|
| - unsigned internalformat) override;
|
| - virtual void DestroyImage(int32_t id) override;
|
| - virtual int32_t CreateGpuMemoryBufferImage(size_t width,
|
| - size_t height,
|
| - unsigned internalformat,
|
| - unsigned usage) override;
|
| - virtual uint32 InsertSyncPoint() override;
|
| - virtual uint32 InsertFutureSyncPoint() override;
|
| - virtual void RetireSyncPoint(uint32 sync_point) override;
|
| - virtual void SignalSyncPoint(uint32 sync_point,
|
| - const base::Closure& callback) override;
|
| - virtual void SignalQuery(uint32 query,
|
| - const base::Closure& callback) override;
|
| - virtual void SetSurfaceVisible(bool visible) override;
|
| - virtual uint32 CreateStreamTexture(uint32 texture_id) override;
|
| + gpu::Capabilities GetCapabilities() override;
|
| + int32_t CreateImage(ClientBuffer buffer,
|
| + size_t width,
|
| + size_t height,
|
| + unsigned internalformat) override;
|
| + void DestroyImage(int32_t id) override;
|
| + int32_t CreateGpuMemoryBufferImage(size_t width,
|
| + size_t height,
|
| + unsigned internalformat,
|
| + unsigned usage) override;
|
| + uint32 InsertSyncPoint() override;
|
| + uint32 InsertFutureSyncPoint() override;
|
| + void RetireSyncPoint(uint32 sync_point) override;
|
| + void SignalSyncPoint(uint32 sync_point,
|
| + const base::Closure& callback) override;
|
| + void SignalQuery(uint32 query, const base::Closure& callback) override;
|
| + void SetSurfaceVisible(bool visible) override;
|
| + uint32 CreateStreamTexture(uint32 texture_id) override;
|
|
|
| private:
|
| class SyncClientImpl;
|
|
|
| // CommandBufferClient implementation:
|
| - virtual void DidDestroy() override;
|
| - virtual void LostContext(int32_t lost_reason) override;
|
| + void DidDestroy() override;
|
| + void LostContext(int32_t lost_reason) override;
|
|
|
| // ErrorHandler implementation:
|
| - virtual void OnConnectionError() override;
|
| + void OnConnectionError() override;
|
|
|
| void TryUpdateState();
|
| void MakeProgressAndUpdateState();
|
|
|