Index: content/common/gpu/client/command_buffer_proxy_impl.h |
diff --git a/content/common/gpu/client/command_buffer_proxy_impl.h b/content/common/gpu/client/command_buffer_proxy_impl.h |
index dd08222957ab24724e62189a252f8311c4205894..64474be06d3b517492b3626acbed47383d09c5b1 100644 |
--- a/content/common/gpu/client/command_buffer_proxy_impl.h |
+++ b/content/common/gpu/client/command_buffer_proxy_impl.h |
@@ -81,38 +81,38 @@ class CommandBufferProxyImpl |
scoped_ptr<media::VideoEncodeAccelerator> CreateVideoEncoder(); |
// IPC::Listener implementation: |
- virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; |
- virtual void OnChannelError() OVERRIDE; |
+ virtual bool OnMessageReceived(const IPC::Message& message) override; |
+ virtual void OnChannelError() 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 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; |
+ int32* id) override; |
+ virtual void DestroyTransferBuffer(int32 id) override; |
// gpu::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_t InsertFutureSyncPoint() OVERRIDE; |
- virtual void RetireSyncPoint(uint32_t sync_point) OVERRIDE; |
+ int32* id) override; |
+ virtual void DestroyGpuMemoryBuffer(int32 id) override; |
+ virtual uint32 InsertSyncPoint() override; |
+ virtual uint32_t InsertFutureSyncPoint() override; |
+ virtual void RetireSyncPoint(uint32_t sync_point) override; |
virtual void SignalSyncPoint(uint32 sync_point, |
- const base::Closure& callback) OVERRIDE; |
+ 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; |
+ const base::Closure& callback) override; |
+ virtual void SetSurfaceVisible(bool visible) override; |
+ virtual uint32 CreateStreamTexture(uint32 texture_id) override; |
int GetRouteID() const; |
bool ProduceFrontBuffer(const gpu::Mailbox& mailbox); |
@@ -136,7 +136,7 @@ class CommandBufferProxyImpl |
// ContentGLContext::MakeCurrent prior to every GL call. It saves returning 6 |
// ints redundantly when only the error is needed for the |
// CommandBufferProxyImpl implementation. |
- virtual gpu::error::Error GetLastError() OVERRIDE; |
+ virtual gpu::error::Error GetLastError() override; |
GpuChannelHost* channel() const { return channel_; } |