Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2777)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/test/test_gles2_interface.h

Issue 628443002: replace OVERRIDE and FINAL with override and final in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/test/test_context_support.h ('k') | cc/test/test_in_process_context_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/test_gles2_interface.h
diff --git a/cc/test/test_gles2_interface.h b/cc/test/test_gles2_interface.h
index ad53c04a8fc6340d7ebda568978a7975f3072a7e..e7200227e05a2c2de29064cab005d50fe829ca15 100644
--- a/cc/test/test_gles2_interface.h
+++ b/cc/test/test_gles2_interface.h
@@ -15,59 +15,59 @@ class TestGLES2Interface : public gpu::gles2::GLES2InterfaceStub {
explicit TestGLES2Interface(TestWebGraphicsContext3D* test_context);
virtual ~TestGLES2Interface();
- virtual void GenTextures(GLsizei n, GLuint* textures) OVERRIDE;
- virtual void GenBuffers(GLsizei n, GLuint* buffers) OVERRIDE;
- virtual void GenFramebuffers(GLsizei n, GLuint* framebuffers) OVERRIDE;
- virtual void GenRenderbuffers(GLsizei n, GLuint* renderbuffers) OVERRIDE;
- virtual void GenQueriesEXT(GLsizei n, GLuint* queries) OVERRIDE;
-
- virtual void DeleteTextures(GLsizei n, const GLuint* textures) OVERRIDE;
- virtual void DeleteBuffers(GLsizei n, const GLuint* buffers) OVERRIDE;
+ virtual void GenTextures(GLsizei n, GLuint* textures) override;
+ virtual void GenBuffers(GLsizei n, GLuint* buffers) override;
+ virtual void GenFramebuffers(GLsizei n, GLuint* framebuffers) override;
+ virtual void GenRenderbuffers(GLsizei n, GLuint* renderbuffers) override;
+ virtual void GenQueriesEXT(GLsizei n, GLuint* queries) override;
+
+ virtual void DeleteTextures(GLsizei n, const GLuint* textures) override;
+ virtual void DeleteBuffers(GLsizei n, const GLuint* buffers) override;
virtual void DeleteFramebuffers(GLsizei n,
- const GLuint* framebuffers) OVERRIDE;
- virtual void DeleteQueriesEXT(GLsizei n, const GLuint* queries) OVERRIDE;
+ const GLuint* framebuffers) override;
+ virtual void DeleteQueriesEXT(GLsizei n, const GLuint* queries) override;
- virtual GLuint CreateShader(GLenum type) OVERRIDE;
- virtual GLuint CreateProgram() OVERRIDE;
+ virtual GLuint CreateShader(GLenum type) override;
+ virtual GLuint CreateProgram() override;
- virtual void BindTexture(GLenum target, GLuint texture) OVERRIDE;
+ virtual void BindTexture(GLenum target, GLuint texture) override;
- virtual void GetIntegerv(GLenum pname, GLint* params) OVERRIDE;
- virtual void GetShaderiv(GLuint shader, GLenum pname, GLint* params) OVERRIDE;
+ virtual void GetIntegerv(GLenum pname, GLint* params) override;
+ virtual void GetShaderiv(GLuint shader, GLenum pname, GLint* params) override;
virtual void GetProgramiv(GLuint program,
GLenum pname,
- GLint* params) OVERRIDE;
+ GLint* params) override;
virtual void GetShaderPrecisionFormat(GLenum shadertype,
GLenum precisiontype,
GLint* range,
- GLint* precision) OVERRIDE;
- virtual GLenum CheckFramebufferStatus(GLenum target) OVERRIDE;
+ GLint* precision) override;
+ virtual GLenum CheckFramebufferStatus(GLenum target) override;
- virtual void ActiveTexture(GLenum target) OVERRIDE;
+ virtual void ActiveTexture(GLenum target) override;
virtual void Viewport(GLint x, GLint y, GLsizei width, GLsizei height)
- OVERRIDE;
- virtual void UseProgram(GLuint program) OVERRIDE;
+ override;
+ virtual void UseProgram(GLuint program) override;
virtual void Scissor(GLint x, GLint y, GLsizei width, GLsizei height)
- OVERRIDE;
+ override;
virtual void DrawElements(GLenum mode,
GLsizei count,
GLenum type,
- const void* indices) OVERRIDE;
+ const void* indices) override;
virtual void ClearColor(GLclampf red,
GLclampf green,
GLclampf blue,
- GLclampf alpha) OVERRIDE;
- virtual void ClearStencil(GLint s) OVERRIDE;
- virtual void Clear(GLbitfield mask) OVERRIDE;
- virtual void Flush() OVERRIDE;
- virtual void Finish() OVERRIDE;
- virtual void ShallowFlushCHROMIUM() OVERRIDE;
- virtual void Enable(GLenum cap) OVERRIDE;
- virtual void Disable(GLenum cap) OVERRIDE;
-
- virtual void BindBuffer(GLenum target, GLuint buffer) OVERRIDE;
- virtual void BindRenderbuffer(GLenum target, GLuint buffer) OVERRIDE;
- virtual void BindFramebuffer(GLenum target, GLuint buffer) OVERRIDE;
+ GLclampf alpha) override;
+ virtual void ClearStencil(GLint s) override;
+ virtual void Clear(GLbitfield mask) override;
+ virtual void Flush() override;
+ virtual void Finish() override;
+ virtual void ShallowFlushCHROMIUM() override;
+ virtual void Enable(GLenum cap) override;
+ virtual void Disable(GLenum cap) override;
+
+ virtual void BindBuffer(GLenum target, GLuint buffer) override;
+ virtual void BindRenderbuffer(GLenum target, GLuint buffer) override;
+ virtual void BindFramebuffer(GLenum target, GLuint buffer) override;
virtual void TexImage2D(GLenum target,
GLint level,
@@ -77,7 +77,7 @@ class TestGLES2Interface : public gpu::gles2::GLES2InterfaceStub {
GLint border,
GLenum format,
GLenum type,
- const void* pixels) OVERRIDE;
+ const void* pixels) override;
virtual void TexSubImage2D(GLenum target,
GLint level,
GLint xoffset,
@@ -86,18 +86,18 @@ class TestGLES2Interface : public gpu::gles2::GLES2InterfaceStub {
GLsizei height,
GLenum format,
GLenum type,
- const void* pixels) OVERRIDE;
+ const void* pixels) override;
virtual void TexStorage2DEXT(GLenum target,
GLsizei levels,
GLenum internalformat,
GLsizei width,
- GLsizei height) OVERRIDE;
+ GLsizei height) override;
virtual void TexImageIOSurface2DCHROMIUM(GLenum target,
GLsizei width,
GLsizei height,
GLuint io_surface_id,
- GLuint plane) OVERRIDE;
- virtual void TexParameteri(GLenum target, GLenum pname, GLint param) OVERRIDE;
+ GLuint plane) override;
+ virtual void TexParameteri(GLenum target, GLenum pname, GLint param) override;
virtual void AsyncTexImage2DCHROMIUM(GLenum target,
GLint level,
@@ -107,7 +107,7 @@ class TestGLES2Interface : public gpu::gles2::GLES2InterfaceStub {
GLint border,
GLenum format,
GLenum type,
- const void* pixels) OVERRIDE;
+ const void* pixels) override;
virtual void AsyncTexSubImage2DCHROMIUM(GLenum target,
GLint level,
GLint xoffset,
@@ -116,7 +116,7 @@ class TestGLES2Interface : public gpu::gles2::GLES2InterfaceStub {
GLsizei height,
GLenum format,
GLenum type,
- const void* pixels) OVERRIDE;
+ const void* pixels) override;
virtual void CompressedTexImage2D(GLenum target,
GLint level,
GLenum internalformat,
@@ -124,74 +124,74 @@ class TestGLES2Interface : public gpu::gles2::GLES2InterfaceStub {
GLsizei height,
GLint border,
GLsizei image_size,
- const void* data) OVERRIDE;
- virtual void WaitAsyncTexImage2DCHROMIUM(GLenum target) OVERRIDE;
+ const void* data) override;
+ virtual void WaitAsyncTexImage2DCHROMIUM(GLenum target) override;
virtual GLuint CreateImageCHROMIUM(GLsizei width,
GLsizei height,
GLenum internalformat,
- GLenum usage) OVERRIDE;
- virtual void DestroyImageCHROMIUM(GLuint image_id) OVERRIDE;
- virtual void* MapImageCHROMIUM(GLuint image_id) OVERRIDE;
+ GLenum usage) override;
+ virtual void DestroyImageCHROMIUM(GLuint image_id) override;
+ virtual void* MapImageCHROMIUM(GLuint image_id) override;
virtual void GetImageParameterivCHROMIUM(GLuint image_id,
GLenum pname,
- GLint* params) OVERRIDE;
- virtual void UnmapImageCHROMIUM(GLuint image_id) OVERRIDE;
+ GLint* params) override;
+ virtual void UnmapImageCHROMIUM(GLuint image_id) override;
virtual GLuint CreateGpuMemoryBufferImageCHROMIUM(GLsizei width,
GLsizei height,
GLenum internalformat,
- GLenum usage) OVERRIDE;
- virtual void BindTexImage2DCHROMIUM(GLenum target, GLint image_id) OVERRIDE;
+ GLenum usage) override;
+ virtual void BindTexImage2DCHROMIUM(GLenum target, GLint image_id) override;
virtual void ReleaseTexImage2DCHROMIUM(GLenum target,
- GLint image_id) OVERRIDE;
+ GLint image_id) override;
virtual void FramebufferRenderbuffer(GLenum target,
GLenum attachment,
GLenum renderbuffertarget,
- GLuint renderbuffer) OVERRIDE;
+ GLuint renderbuffer) override;
virtual void FramebufferTexture2D(GLenum target,
GLenum attachment,
GLenum textarget,
GLuint texture,
- GLint level) OVERRIDE;
+ GLint level) override;
virtual void RenderbufferStorage(GLenum target,
GLenum internalformat,
GLsizei width,
- GLsizei height) OVERRIDE;
+ GLsizei height) override;
- virtual void* MapBufferCHROMIUM(GLuint target, GLenum access) OVERRIDE;
- virtual GLboolean UnmapBufferCHROMIUM(GLuint target) OVERRIDE;
+ virtual void* MapBufferCHROMIUM(GLuint target, GLenum access) override;
+ virtual GLboolean UnmapBufferCHROMIUM(GLuint target) override;
virtual void BufferData(GLenum target,
GLsizeiptr size,
const void* data,
- GLenum usage) OVERRIDE;
+ GLenum usage) override;
- virtual void WaitSyncPointCHROMIUM(GLuint sync_point) OVERRIDE;
- virtual GLuint InsertSyncPointCHROMIUM() OVERRIDE;
+ virtual void WaitSyncPointCHROMIUM(GLuint sync_point) override;
+ virtual GLuint InsertSyncPointCHROMIUM() override;
- virtual void BeginQueryEXT(GLenum target, GLuint id) OVERRIDE;
- virtual void EndQueryEXT(GLenum target) OVERRIDE;
+ virtual void BeginQueryEXT(GLenum target, GLuint id) override;
+ virtual void EndQueryEXT(GLenum target) override;
virtual void GetQueryObjectuivEXT(GLuint id,
GLenum pname,
- GLuint* params) OVERRIDE;
+ GLuint* params) override;
virtual void DiscardFramebufferEXT(GLenum target,
GLsizei count,
- const GLenum* attachments) OVERRIDE;
- virtual void GenMailboxCHROMIUM(GLbyte* mailbox) OVERRIDE;
+ const GLenum* attachments) override;
+ virtual void GenMailboxCHROMIUM(GLbyte* mailbox) override;
virtual void ProduceTextureCHROMIUM(GLenum target,
- const GLbyte* mailbox) OVERRIDE;
+ const GLbyte* mailbox) override;
virtual void ProduceTextureDirectCHROMIUM(GLuint texture,
GLenum target,
- const GLbyte* mailbox) OVERRIDE;
+ const GLbyte* mailbox) override;
virtual void ConsumeTextureCHROMIUM(GLenum target,
- const GLbyte* mailbox) OVERRIDE;
+ const GLbyte* mailbox) override;
virtual GLuint CreateAndConsumeTextureCHROMIUM(
GLenum target,
- const GLbyte* mailbox) OVERRIDE;
+ const GLbyte* mailbox) override;
virtual void ResizeCHROMIUM(GLuint width,
GLuint height,
- float device_scale) OVERRIDE;
- virtual void LoseContextCHROMIUM(GLenum current, GLenum other) OVERRIDE;
+ float device_scale) override;
+ virtual void LoseContextCHROMIUM(GLenum current, GLenum other) override;
private:
TestWebGraphicsContext3D* test_context_;
« no previous file with comments | « cc/test/test_context_support.h ('k') | cc/test/test_in_process_context_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698