Index: cc/output/gl_renderer_unittest.cc |
diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc |
index c98652c28758b339104187bbe0071c703463b171..45b6d2ab989a9c727ec5642b81042f1393a5f2b1 100644 |
--- a/cc/output/gl_renderer_unittest.cc |
+++ b/cc/output/gl_renderer_unittest.cc |
@@ -363,35 +363,35 @@ class ForbidSynchronousCallContext : public TestWebGraphicsContext3D { |
virtual void getAttachedShaders(GLuint program, |
GLsizei max_count, |
GLsizei* count, |
- GLuint* shaders) OVERRIDE { |
+ GLuint* shaders) override { |
ADD_FAILURE(); |
} |
- virtual GLint getAttribLocation(GLuint program, const GLchar* name) OVERRIDE { |
+ virtual GLint getAttribLocation(GLuint program, const GLchar* name) override { |
ADD_FAILURE(); |
return 0; |
} |
- virtual void getBooleanv(GLenum pname, GLboolean* value) OVERRIDE { |
+ virtual void getBooleanv(GLenum pname, GLboolean* value) override { |
ADD_FAILURE(); |
} |
virtual void getBufferParameteriv(GLenum target, |
GLenum pname, |
- GLint* value) OVERRIDE { |
+ GLint* value) override { |
ADD_FAILURE(); |
} |
- virtual GLenum getError() OVERRIDE { |
+ virtual GLenum getError() override { |
ADD_FAILURE(); |
return GL_NO_ERROR; |
} |
- virtual void getFloatv(GLenum pname, GLfloat* value) OVERRIDE { |
+ virtual void getFloatv(GLenum pname, GLfloat* value) override { |
ADD_FAILURE(); |
} |
virtual void getFramebufferAttachmentParameteriv(GLenum target, |
GLenum attachment, |
GLenum pname, |
- GLint* value) OVERRIDE { |
+ GLint* value) override { |
ADD_FAILURE(); |
} |
- virtual void getIntegerv(GLenum pname, GLint* value) OVERRIDE { |
+ virtual void getIntegerv(GLenum pname, GLint* value) override { |
if (pname == GL_MAX_TEXTURE_SIZE) { |
// MAX_TEXTURE_SIZE is cached client side, so it's OK to query. |
*value = 1024; |
@@ -404,7 +404,7 @@ class ForbidSynchronousCallContext : public TestWebGraphicsContext3D { |
// mode, but not release. |
virtual void getProgramiv(GLuint program, |
GLenum pname, |
- GLint* value) OVERRIDE { |
+ GLint* value) override { |
#ifndef NDEBUG |
*value = 1; |
#else |
@@ -412,7 +412,7 @@ class ForbidSynchronousCallContext : public TestWebGraphicsContext3D { |
#endif |
} |
- virtual void getShaderiv(GLuint shader, GLenum pname, GLint* value) OVERRIDE { |
+ virtual void getShaderiv(GLuint shader, GLenum pname, GLint* value) override { |
#ifndef NDEBUG |
*value = 1; |
#else |
@@ -422,53 +422,53 @@ class ForbidSynchronousCallContext : public TestWebGraphicsContext3D { |
virtual void getRenderbufferParameteriv(GLenum target, |
GLenum pname, |
- GLint* value) OVERRIDE { |
+ GLint* value) override { |
ADD_FAILURE(); |
} |
virtual void getShaderPrecisionFormat(GLenum shadertype, |
GLenum precisiontype, |
GLint* range, |
- GLint* precision) OVERRIDE { |
+ GLint* precision) override { |
ADD_FAILURE(); |
} |
virtual void getTexParameterfv(GLenum target, |
GLenum pname, |
- GLfloat* value) OVERRIDE { |
+ GLfloat* value) override { |
ADD_FAILURE(); |
} |
virtual void getTexParameteriv(GLenum target, |
GLenum pname, |
- GLint* value) OVERRIDE { |
+ GLint* value) override { |
ADD_FAILURE(); |
} |
virtual void getUniformfv(GLuint program, |
GLint location, |
- GLfloat* value) OVERRIDE { |
+ GLfloat* value) override { |
ADD_FAILURE(); |
} |
virtual void getUniformiv(GLuint program, |
GLint location, |
- GLint* value) OVERRIDE { |
+ GLint* value) override { |
ADD_FAILURE(); |
} |
virtual GLint getUniformLocation(GLuint program, |
- const GLchar* name) OVERRIDE { |
+ const GLchar* name) override { |
ADD_FAILURE(); |
return 0; |
} |
virtual void getVertexAttribfv(GLuint index, |
GLenum pname, |
- GLfloat* value) OVERRIDE { |
+ GLfloat* value) override { |
ADD_FAILURE(); |
} |
virtual void getVertexAttribiv(GLuint index, |
GLenum pname, |
- GLint* value) OVERRIDE { |
+ GLint* value) override { |
ADD_FAILURE(); |
} |
virtual GLsizeiptr getVertexAttribOffset(GLuint index, |
- GLenum pname) OVERRIDE { |
+ GLenum pname) override { |
ADD_FAILURE(); |
return 0; |
} |
@@ -504,12 +504,12 @@ class LoseContextOnFirstGetContext : public TestWebGraphicsContext3D { |
virtual void getProgramiv(GLuint program, |
GLenum pname, |
- GLint* value) OVERRIDE { |
+ GLint* value) override { |
context_lost_ = true; |
*value = 0; |
} |
- virtual void getShaderiv(GLuint shader, GLenum pname, GLint* value) OVERRIDE { |
+ virtual void getShaderiv(GLuint shader, GLenum pname, GLint* value) override { |
context_lost_ = true; |
*value = 0; |
} |
@@ -700,17 +700,17 @@ class VisibilityChangeIsLastCallTrackingContext |
: last_call_was_set_visibility_(false) {} |
// TestWebGraphicsContext3D methods. |
- virtual void flush() OVERRIDE { last_call_was_set_visibility_ = false; } |
- virtual void deleteTexture(GLuint) OVERRIDE { |
+ virtual void flush() override { last_call_was_set_visibility_ = false; } |
+ virtual void deleteTexture(GLuint) override { |
last_call_was_set_visibility_ = false; |
} |
- virtual void deleteFramebuffer(GLuint) OVERRIDE { |
+ virtual void deleteFramebuffer(GLuint) override { |
last_call_was_set_visibility_ = false; |
} |
- virtual void deleteQueryEXT(GLuint) OVERRIDE { |
+ virtual void deleteQueryEXT(GLuint) override { |
last_call_was_set_visibility_ = false; |
} |
- virtual void deleteRenderbuffer(GLuint) OVERRIDE { |
+ virtual void deleteRenderbuffer(GLuint) override { |
last_call_was_set_visibility_ = false; |
} |
@@ -979,14 +979,14 @@ class ScissorTestOnClearCheckingContext : public TestWebGraphicsContext3D { |
public: |
ScissorTestOnClearCheckingContext() : scissor_enabled_(false) {} |
- virtual void clear(GLbitfield) OVERRIDE { EXPECT_FALSE(scissor_enabled_); } |
+ virtual void clear(GLbitfield) override { EXPECT_FALSE(scissor_enabled_); } |
- virtual void enable(GLenum cap) OVERRIDE { |
+ virtual void enable(GLenum cap) override { |
if (cap == GL_SCISSOR_TEST) |
scissor_enabled_ = true; |
} |
- virtual void disable(GLenum cap) OVERRIDE { |
+ virtual void disable(GLenum cap) override { |
if (cap == GL_SCISSOR_TEST) |
scissor_enabled_ = false; |
} |
@@ -1069,7 +1069,7 @@ class DiscardCheckingContext : public TestWebGraphicsContext3D { |
virtual void discardFramebufferEXT(GLenum target, |
GLsizei numAttachments, |
- const GLenum* attachments) OVERRIDE { |
+ const GLenum* attachments) override { |
++discarded_; |
} |
@@ -1088,7 +1088,7 @@ class NonReshapableOutputSurface : public FakeOutputSurface { |
false) { |
surface_size_ = gfx::Size(500, 500); |
} |
- virtual void Reshape(const gfx::Size& size, float scale_factor) OVERRIDE {} |
+ virtual void Reshape(const gfx::Size& size, float scale_factor) override {} |
void set_fixed_size(const gfx::Size& size) { surface_size_ = size; } |
}; |
@@ -1258,7 +1258,7 @@ class FlippedScissorAndViewportContext : public TestWebGraphicsContext3D { |
} |
virtual void viewport(GLint x, GLint y, GLsizei width, GLsizei height) |
- OVERRIDE { |
+ override { |
EXPECT_EQ(10, x); |
EXPECT_EQ(390, y); |
EXPECT_EQ(100, width); |
@@ -1267,7 +1267,7 @@ class FlippedScissorAndViewportContext : public TestWebGraphicsContext3D { |
} |
virtual void scissor(GLint x, GLint y, GLsizei width, GLsizei height) |
- OVERRIDE { |
+ override { |
EXPECT_EQ(30, x); |
EXPECT_EQ(450, y); |
EXPECT_EQ(20, width); |