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

Unified Diff: cc/test/test_gles2_interface.h

Issue 645853008: Standardize usage of virtual/override/final in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formatted 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_gpu_memory_buffer_manager.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 70d8288307cc3b26e088da7973eb1c7d77a97da9..a12147a639d5aee75a860c38b705581bee9b4a5e 100644
--- a/cc/test/test_gles2_interface.h
+++ b/cc/test/test_gles2_interface.h
@@ -13,180 +13,167 @@ class TestWebGraphicsContext3D;
class TestGLES2Interface : public gpu::gles2::GLES2InterfaceStub {
public:
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 DeleteFramebuffers(GLsizei n,
- const GLuint* framebuffers) override;
- virtual void DeleteQueriesEXT(GLsizei n, const GLuint* queries) override;
-
- virtual GLuint CreateShader(GLenum type) override;
- virtual GLuint CreateProgram() 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 GetProgramiv(GLuint program,
- GLenum pname,
- GLint* params) override;
- virtual void GetShaderPrecisionFormat(GLenum shadertype,
- GLenum precisiontype,
- GLint* range,
- GLint* precision) override;
- virtual GLenum CheckFramebufferStatus(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;
- virtual void Scissor(GLint x, GLint y, GLsizei width, GLsizei height)
- override;
- virtual void DrawElements(GLenum mode,
- GLsizei count,
- GLenum type,
- 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;
-
- virtual void TexImage2D(GLenum target,
- GLint level,
- GLint internalformat,
- GLsizei width,
- GLsizei height,
- GLint border,
- GLenum format,
- GLenum type,
- const void* pixels) override;
- virtual void TexSubImage2D(GLenum target,
- GLint level,
- GLint xoffset,
- GLint yoffset,
- GLsizei width,
- GLsizei height,
- GLenum format,
- GLenum type,
- const void* pixels) override;
- virtual void TexStorage2DEXT(GLenum target,
- GLsizei levels,
+ ~TestGLES2Interface() override;
+
+ void GenTextures(GLsizei n, GLuint* textures) override;
+ void GenBuffers(GLsizei n, GLuint* buffers) override;
+ void GenFramebuffers(GLsizei n, GLuint* framebuffers) override;
+ void GenRenderbuffers(GLsizei n, GLuint* renderbuffers) override;
+ void GenQueriesEXT(GLsizei n, GLuint* queries) override;
+
+ void DeleteTextures(GLsizei n, const GLuint* textures) override;
+ void DeleteBuffers(GLsizei n, const GLuint* buffers) override;
+ void DeleteFramebuffers(GLsizei n, const GLuint* framebuffers) override;
+ void DeleteQueriesEXT(GLsizei n, const GLuint* queries) override;
+
+ GLuint CreateShader(GLenum type) override;
+ GLuint CreateProgram() override;
+
+ void BindTexture(GLenum target, GLuint texture) override;
+
+ void GetIntegerv(GLenum pname, GLint* params) override;
+ void GetShaderiv(GLuint shader, GLenum pname, GLint* params) override;
+ void GetProgramiv(GLuint program, GLenum pname, GLint* params) override;
+ void GetShaderPrecisionFormat(GLenum shadertype,
+ GLenum precisiontype,
+ GLint* range,
+ GLint* precision) override;
+ GLenum CheckFramebufferStatus(GLenum target) override;
+
+ void ActiveTexture(GLenum target) override;
+ void Viewport(GLint x, GLint y, GLsizei width, GLsizei height) override;
+ void UseProgram(GLuint program) override;
+ void Scissor(GLint x, GLint y, GLsizei width, GLsizei height) override;
+ void DrawElements(GLenum mode,
+ GLsizei count,
+ GLenum type,
+ const void* indices) override;
+ void ClearColor(GLclampf red,
+ GLclampf green,
+ GLclampf blue,
+ GLclampf alpha) override;
+ void ClearStencil(GLint s) override;
+ void Clear(GLbitfield mask) override;
+ void Flush() override;
+ void Finish() override;
+ void ShallowFlushCHROMIUM() override;
+ void Enable(GLenum cap) override;
+ void Disable(GLenum cap) override;
+
+ void BindBuffer(GLenum target, GLuint buffer) override;
+ void BindRenderbuffer(GLenum target, GLuint buffer) override;
+ void BindFramebuffer(GLenum target, GLuint buffer) override;
+
+ void TexImage2D(GLenum target,
+ GLint level,
+ GLint internalformat,
+ GLsizei width,
+ GLsizei height,
+ GLint border,
+ GLenum format,
+ GLenum type,
+ const void* pixels) override;
+ void TexSubImage2D(GLenum target,
+ GLint level,
+ GLint xoffset,
+ GLint yoffset,
+ GLsizei width,
+ GLsizei height,
+ GLenum format,
+ GLenum type,
+ const void* pixels) override;
+ void TexStorage2DEXT(GLenum target,
+ GLsizei levels,
+ GLenum internalformat,
+ GLsizei width,
+ GLsizei height) override;
+ void TexImageIOSurface2DCHROMIUM(GLenum target,
+ GLsizei width,
+ GLsizei height,
+ GLuint io_surface_id,
+ GLuint plane) override;
+ void TexParameteri(GLenum target, GLenum pname, GLint param) override;
+
+ void AsyncTexImage2DCHROMIUM(GLenum target,
+ GLint level,
GLenum internalformat,
GLsizei width,
- 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;
-
- virtual void AsyncTexImage2DCHROMIUM(GLenum target,
- GLint level,
- GLenum internalformat,
- GLsizei width,
- GLsizei height,
- GLint border,
- GLenum format,
- GLenum type,
- const void* pixels) override;
- virtual void AsyncTexSubImage2DCHROMIUM(GLenum target,
- GLint level,
- GLint xoffset,
- GLint yoffset,
- GLsizei width,
- GLsizei height,
- GLenum format,
- GLenum type,
- const void* pixels) override;
- virtual void CompressedTexImage2D(GLenum target,
- GLint level,
- GLenum internalformat,
- GLsizei width,
- GLsizei height,
- GLint border,
- GLsizei image_size,
- const void* data) override;
- virtual void WaitAsyncTexImage2DCHROMIUM(GLenum target) override;
- virtual GLuint CreateImageCHROMIUM(ClientBuffer buffer,
- GLsizei width,
- GLsizei height,
- GLenum internalformat) override;
- virtual void DestroyImageCHROMIUM(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;
- virtual void ReleaseTexImage2DCHROMIUM(GLenum target,
- GLint image_id) override;
- virtual void FramebufferRenderbuffer(GLenum target,
- GLenum attachment,
- GLenum renderbuffertarget,
- GLuint renderbuffer) override;
- virtual void FramebufferTexture2D(GLenum target,
- GLenum attachment,
- GLenum textarget,
- GLuint texture,
- GLint level) override;
- virtual void RenderbufferStorage(GLenum target,
- GLenum internalformat,
- GLsizei width,
- GLsizei height) 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;
-
- 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 GetQueryObjectuivEXT(GLuint id,
- GLenum pname,
- GLuint* params) override;
-
- virtual void DiscardFramebufferEXT(GLenum target,
- GLsizei count,
- const GLenum* attachments) override;
- virtual void GenMailboxCHROMIUM(GLbyte* mailbox) override;
- virtual void ProduceTextureCHROMIUM(GLenum target,
- const GLbyte* mailbox) override;
- virtual void ProduceTextureDirectCHROMIUM(GLuint texture,
- GLenum target,
- const GLbyte* mailbox) override;
- virtual void ConsumeTextureCHROMIUM(GLenum target,
- const GLbyte* mailbox) override;
- virtual GLuint CreateAndConsumeTextureCHROMIUM(
- GLenum target,
- const GLbyte* mailbox) override;
-
- virtual void ResizeCHROMIUM(GLuint width,
- GLuint height,
- float device_scale) override;
- virtual void LoseContextCHROMIUM(GLenum current, GLenum other) override;
+ GLsizei height,
+ GLint border,
+ GLenum format,
+ GLenum type,
+ const void* pixels) override;
+ void AsyncTexSubImage2DCHROMIUM(GLenum target,
+ GLint level,
+ GLint xoffset,
+ GLint yoffset,
+ GLsizei width,
+ GLsizei height,
+ GLenum format,
+ GLenum type,
+ const void* pixels) override;
+ void CompressedTexImage2D(GLenum target,
+ GLint level,
+ GLenum internalformat,
+ GLsizei width,
+ GLsizei height,
+ GLint border,
+ GLsizei image_size,
+ const void* data) override;
+ void WaitAsyncTexImage2DCHROMIUM(GLenum target) override;
+ GLuint CreateImageCHROMIUM(ClientBuffer buffer,
+ GLsizei width,
+ GLsizei height,
+ GLenum internalformat) override;
+ void DestroyImageCHROMIUM(GLuint image_id) override;
+ GLuint CreateGpuMemoryBufferImageCHROMIUM(GLsizei width,
+ GLsizei height,
+ GLenum internalformat,
+ GLenum usage) override;
+ void BindTexImage2DCHROMIUM(GLenum target, GLint image_id) override;
+ void ReleaseTexImage2DCHROMIUM(GLenum target, GLint image_id) override;
+ void FramebufferRenderbuffer(GLenum target,
+ GLenum attachment,
+ GLenum renderbuffertarget,
+ GLuint renderbuffer) override;
+ void FramebufferTexture2D(GLenum target,
+ GLenum attachment,
+ GLenum textarget,
+ GLuint texture,
+ GLint level) override;
+ void RenderbufferStorage(GLenum target,
+ GLenum internalformat,
+ GLsizei width,
+ GLsizei height) override;
+
+ void* MapBufferCHROMIUM(GLuint target, GLenum access) override;
+ GLboolean UnmapBufferCHROMIUM(GLuint target) override;
+ void BufferData(GLenum target,
+ GLsizeiptr size,
+ const void* data,
+ GLenum usage) override;
+
+ void WaitSyncPointCHROMIUM(GLuint sync_point) override;
+ GLuint InsertSyncPointCHROMIUM() override;
+
+ void BeginQueryEXT(GLenum target, GLuint id) override;
+ void EndQueryEXT(GLenum target) override;
+ void GetQueryObjectuivEXT(GLuint id, GLenum pname, GLuint* params) override;
+
+ void DiscardFramebufferEXT(GLenum target,
+ GLsizei count,
+ const GLenum* attachments) override;
+ void GenMailboxCHROMIUM(GLbyte* mailbox) override;
+ void ProduceTextureCHROMIUM(GLenum target, const GLbyte* mailbox) override;
+ void ProduceTextureDirectCHROMIUM(GLuint texture,
+ GLenum target,
+ const GLbyte* mailbox) override;
+ void ConsumeTextureCHROMIUM(GLenum target, const GLbyte* mailbox) override;
+ GLuint CreateAndConsumeTextureCHROMIUM(GLenum target,
+ const GLbyte* mailbox) override;
+
+ void ResizeCHROMIUM(GLuint width, GLuint height, float device_scale) override;
+ 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_gpu_memory_buffer_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698