| Index: gpu/command_buffer/service/in_process_command_buffer.h
|
| diff --git a/gpu/command_buffer/service/in_process_command_buffer.h b/gpu/command_buffer/service/in_process_command_buffer.h
|
| index b65072537f78ae38970f8a55539d60638d2104f1..e91d6f647371b1aeca3faa8083578a6de5a39352 100644
|
| --- a/gpu/command_buffer/service/in_process_command_buffer.h
|
| +++ b/gpu/command_buffer/service/in_process_command_buffer.h
|
| @@ -80,35 +80,35 @@ class GPU_EXPORT InProcessCommandBuffer : public CommandBuffer,
|
| void Destroy();
|
|
|
| // 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 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;
|
| - virtual gpu::error::Error GetLastError() OVERRIDE;
|
| + int32* id) override;
|
| + virtual void DestroyTransferBuffer(int32 id) override;
|
| + virtual gpu::error::Error GetLastError() override;
|
|
|
| // GpuControl implementation:
|
| - virtual gpu::Capabilities GetCapabilities() OVERRIDE;
|
| + virtual gpu::Capabilities GetCapabilities() override;
|
| virtual gfx::GpuMemoryBuffer* CreateGpuMemoryBuffer(size_t width,
|
| size_t height,
|
| unsigned internalformat,
|
| unsigned usage,
|
| - int32* id) OVERRIDE;
|
| - virtual void DestroyGpuMemoryBuffer(int32 id) OVERRIDE;
|
| - virtual uint32 InsertSyncPoint() OVERRIDE;
|
| - virtual uint32 InsertFutureSyncPoint() OVERRIDE;
|
| - virtual void RetireSyncPoint(uint32 sync_point) OVERRIDE;
|
| + int32* id) override;
|
| + virtual void DestroyGpuMemoryBuffer(int32 id) 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;
|
| + const base::Closure& callback) override;
|
| virtual void SignalQuery(uint32 query_id,
|
| - const base::Closure& callback) OVERRIDE;
|
| - virtual void SetSurfaceVisible(bool visible) OVERRIDE;
|
| - virtual uint32 CreateStreamTexture(uint32 texture_id) OVERRIDE;
|
| + const base::Closure& callback) override;
|
| + virtual void SetSurfaceVisible(bool visible) override;
|
| + virtual uint32 CreateStreamTexture(uint32 texture_id) override;
|
|
|
| // The serializer interface to the GPU service (i.e. thread).
|
| class Service {
|
|
|