Index: gpu/command_buffer/client/share_group.cc |
diff --git a/gpu/command_buffer/client/share_group.cc b/gpu/command_buffer/client/share_group.cc |
index 96ab8d181be01ab52edda453043ad4bbd451bf78..b99ad1e0f3176d188fc31eba70129ded89e3533d 100644 |
--- a/gpu/command_buffer/client/share_group.cc |
+++ b/gpu/command_buffer/client/share_group.cc |
@@ -31,7 +31,7 @@ class IdHandler : public IdHandlerInterface { |
// Overridden from IdHandlerInterface. |
virtual void MakeIds( |
GLES2Implementation* /* gl_impl */, |
- GLuint id_offset, GLsizei n, GLuint* ids) OVERRIDE { |
+ GLuint id_offset, GLsizei n, GLuint* ids) override { |
base::AutoLock auto_lock(lock_); |
if (id_offset == 0) { |
for (GLsizei ii = 0; ii < n; ++ii) { |
@@ -48,7 +48,7 @@ class IdHandler : public IdHandlerInterface { |
// Overridden from IdHandlerInterface. |
virtual bool FreeIds( |
GLES2Implementation* gl_impl, |
- GLsizei n, const GLuint* ids, DeleteFn delete_fn) OVERRIDE { |
+ GLsizei n, const GLuint* ids, DeleteFn delete_fn) override { |
base::AutoLock auto_lock(lock_); |
for (GLsizei ii = 0; ii < n; ++ii) { |
@@ -65,14 +65,14 @@ class IdHandler : public IdHandlerInterface { |
} |
// Overridden from IdHandlerInterface. |
- virtual bool MarkAsUsedForBind(GLuint id) OVERRIDE { |
+ virtual bool MarkAsUsedForBind(GLuint id) override { |
if (id == 0) |
return true; |
base::AutoLock auto_lock(lock_); |
return id_allocator_.MarkAsUsed(id); |
} |
- virtual void FreeContext(GLES2Implementation* gl_impl) OVERRIDE {} |
+ virtual void FreeContext(GLES2Implementation* gl_impl) override {} |
private: |
base::Lock lock_; |
@@ -89,7 +89,7 @@ class StrictIdHandler : public IdHandlerInterface { |
virtual void MakeIds(GLES2Implementation* gl_impl, |
GLuint /* id_offset */, |
GLsizei n, |
- GLuint* ids) OVERRIDE { |
+ GLuint* ids) override { |
base::AutoLock auto_lock(lock_); |
// Collect pending FreeIds from other flush_generation. |
@@ -116,7 +116,7 @@ class StrictIdHandler : public IdHandlerInterface { |
virtual bool FreeIds(GLES2Implementation* gl_impl, |
GLsizei n, |
const GLuint* ids, |
- DeleteFn delete_fn) OVERRIDE { |
+ DeleteFn delete_fn) override { |
// Delete stub must run before CollectPendingFreeIds. |
(gl_impl->*delete_fn)(n, ids); |
@@ -146,7 +146,7 @@ class StrictIdHandler : public IdHandlerInterface { |
} |
// Overridden from IdHandler. |
- virtual bool MarkAsUsedForBind(GLuint id) OVERRIDE { |
+ virtual bool MarkAsUsedForBind(GLuint id) override { |
#ifndef NDEBUG |
if (id != 0) { |
base::AutoLock auto_lock(lock_); |
@@ -157,7 +157,7 @@ class StrictIdHandler : public IdHandlerInterface { |
} |
// Overridden from IdHandlerInterface. |
- virtual void FreeContext(GLES2Implementation* gl_impl) OVERRIDE { |
+ virtual void FreeContext(GLES2Implementation* gl_impl) override { |
base::AutoLock auto_lock(lock_); |
CollectPendingFreeIds(gl_impl); |
} |
@@ -198,7 +198,7 @@ class NonReusedIdHandler : public IdHandlerInterface { |
// Overridden from IdHandlerInterface. |
virtual void MakeIds( |
GLES2Implementation* /* gl_impl */, |
- GLuint id_offset, GLsizei n, GLuint* ids) OVERRIDE { |
+ GLuint id_offset, GLsizei n, GLuint* ids) override { |
base::AutoLock auto_lock(lock_); |
for (GLsizei ii = 0; ii < n; ++ii) { |
ids[ii] = ++last_id_ + id_offset; |
@@ -208,19 +208,19 @@ class NonReusedIdHandler : public IdHandlerInterface { |
// Overridden from IdHandlerInterface. |
virtual bool FreeIds( |
GLES2Implementation* gl_impl, |
- GLsizei n, const GLuint* ids, DeleteFn delete_fn) OVERRIDE { |
+ GLsizei n, const GLuint* ids, DeleteFn delete_fn) override { |
// Ids are never freed. |
(gl_impl->*delete_fn)(n, ids); |
return true; |
} |
// Overridden from IdHandlerInterface. |
- virtual bool MarkAsUsedForBind(GLuint /* id */) OVERRIDE { |
+ virtual bool MarkAsUsedForBind(GLuint /* id */) override { |
// This is only used for Shaders and Programs which have no bind. |
return false; |
} |
- virtual void FreeContext(GLES2Implementation* gl_impl) OVERRIDE {} |
+ virtual void FreeContext(GLES2Implementation* gl_impl) override {} |
private: |
base::Lock lock_; |