diff options
author | viettrungluu <viettrungluu@chromium.org> | 2014-09-29 22:04:53 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-30 05:05:04 +0000 |
commit | 473e9133cbe6f90140bf172003e70ee788afc5d9 (patch) | |
tree | f5d370019071d5eb13e33e187c5b0f8a7933c67e /mojo/gles2 | |
parent | 5f7ee2f338c9d7c5616c18e594ec8ef834d718c6 (diff) | |
download | chromium_src-473e9133cbe6f90140bf172003e70ee788afc5d9.zip chromium_src-473e9133cbe6f90140bf172003e70ee788afc5d9.tar.gz chromium_src-473e9133cbe6f90140bf172003e70ee788afc5d9.tar.bz2 |
Mojo: Convert OVERRIDE -> override in various subdirectories of mojo/.
(Every subdirectory except aura/, examples/, services/, and views/.)
R=jamesr@chromium.org
Review URL: https://codereview.chromium.org/619493002
Cr-Commit-Position: refs/heads/master@{#297364}
Diffstat (limited to 'mojo/gles2')
-rw-r--r-- | mojo/gles2/command_buffer_client_impl.cc | 4 | ||||
-rw-r--r-- | mojo/gles2/command_buffer_client_impl.h | 46 | ||||
-rw-r--r-- | mojo/gles2/gles2_context.h | 2 |
3 files changed, 26 insertions, 26 deletions
diff --git a/mojo/gles2/command_buffer_client_impl.cc b/mojo/gles2/command_buffer_client_impl.cc index 233573f..2d3387b 100644 --- a/mojo/gles2/command_buffer_client_impl.cc +++ b/mojo/gles2/command_buffer_client_impl.cc @@ -64,10 +64,10 @@ class CommandBufferClientImpl::SyncClientImpl private: // CommandBufferSyncClient methods: - virtual void DidInitialize(bool success) OVERRIDE { + virtual void DidInitialize(bool success) override { initialized_successfully_ = success; } - virtual void DidMakeProgress(CommandBufferStatePtr state) OVERRIDE { + virtual void DidMakeProgress(CommandBufferStatePtr state) override { command_buffer_state_ = state.Pass(); } diff --git a/mojo/gles2/command_buffer_client_impl.h b/mojo/gles2/command_buffer_client_impl.h index e192169..2241b60 100644 --- a/mojo/gles2/command_buffer_client_impl.h +++ b/mojo/gles2/command_buffer_client_impl.h @@ -41,45 +41,45 @@ class CommandBufferClientImpl : public CommandBufferClient, virtual ~CommandBufferClientImpl(); // 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 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, - const base::Closure& callback) OVERRIDE; - virtual void SetSurfaceVisible(bool visible) OVERRIDE; - virtual void Echo(const base::Closure& callback) OVERRIDE; - virtual uint32 CreateStreamTexture(uint32 texture_id) OVERRIDE; + const base::Closure& callback) override; + virtual void SetSurfaceVisible(bool visible) override; + virtual void Echo(const base::Closure& callback) override; + virtual uint32 CreateStreamTexture(uint32 texture_id) override; private: class SyncClientImpl; // CommandBufferClient implementation: - virtual void DidDestroy() OVERRIDE; - virtual void LostContext(int32_t lost_reason) OVERRIDE; + virtual void DidDestroy() override; + virtual void LostContext(int32_t lost_reason) override; // ErrorHandler implementation: - virtual void OnConnectionError() OVERRIDE; + virtual void OnConnectionError() override; void TryUpdateState(); void MakeProgressAndUpdateState(); diff --git a/mojo/gles2/gles2_context.h b/mojo/gles2/gles2_context.h index ab39c4c..0bbb754 100644 --- a/mojo/gles2/gles2_context.h +++ b/mojo/gles2/gles2_context.h @@ -40,7 +40,7 @@ class GLES2Context : public CommandBufferDelegate, gpu::ContextSupport* context_support() const { return implementation_.get(); } private: - virtual void ContextLost() OVERRIDE; + virtual void ContextLost() override; CommandBufferClientImpl command_buffer_; scoped_ptr<gpu::gles2::GLES2CmdHelper> gles2_helper_; |