summaryrefslogtreecommitdiffstats
path: root/mojo/gles2
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-10-21 05:16:28 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-21 12:16:41 +0000
commit3fc12db4bdf0829f206dafbb23d411ff502d7de6 (patch)
tree490d64d00346164d5f7ee866d7d44dc269c632aa /mojo/gles2
parentc2282aa89148883769f87c74cc3c4608c0933489 (diff)
downloadchromium_src-3fc12db4bdf0829f206dafbb23d411ff502d7de6.zip
chromium_src-3fc12db4bdf0829f206dafbb23d411ff502d7de6.tar.gz
chromium_src-3fc12db4bdf0829f206dafbb23d411ff502d7de6.tar.bz2
Standardize usage of virtual/override/final in mojo/
This patch was automatically generated by applying clang fixit hints generated by the plugin to the source tree. BUG=417463 TBR=mpcomplete@chromium.org Review URL: https://codereview.chromium.org/668663006 Cr-Commit-Position: refs/heads/master@{#300470}
Diffstat (limited to 'mojo/gles2')
-rw-r--r--mojo/gles2/command_buffer_client_impl.cc4
-rw-r--r--mojo/gles2/command_buffer_client_impl.h65
-rw-r--r--mojo/gles2/gles2_context.h4
3 files changed, 36 insertions, 37 deletions
diff --git a/mojo/gles2/command_buffer_client_impl.cc b/mojo/gles2/command_buffer_client_impl.cc
index a379020..8ad03d9 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 {
+ void DidInitialize(bool success) override {
initialized_successfully_ = success;
}
- virtual void DidMakeProgress(CommandBufferStatePtr state) override {
+ 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 5e6ffe1..297cb42 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();
diff --git a/mojo/gles2/gles2_context.h b/mojo/gles2/gles2_context.h
index 0bbb754..7dd1085 100644
--- a/mojo/gles2/gles2_context.h
+++ b/mojo/gles2/gles2_context.h
@@ -31,7 +31,7 @@ class GLES2Context : public CommandBufferDelegate,
ScopedMessagePipeHandle command_buffer_handle,
MojoGLES2ContextLost lost_callback,
void* closure);
- virtual ~GLES2Context();
+ ~GLES2Context() override;
bool Initialize();
gpu::gles2::GLES2Interface* interface() const {
@@ -40,7 +40,7 @@ class GLES2Context : public CommandBufferDelegate,
gpu::ContextSupport* context_support() const { return implementation_.get(); }
private:
- virtual void ContextLost() override;
+ void ContextLost() override;
CommandBufferClientImpl command_buffer_;
scoped_ptr<gpu::gles2::GLES2CmdHelper> gles2_helper_;