diff options
author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-06 17:06:34 +0000 |
---|---|---|
committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-06 17:06:34 +0000 |
commit | 86fef131473cc05a460388193b01215130cf5866 (patch) | |
tree | d56d15a2de2dd722b60874e2262d1a2b86ff45d7 /gpu | |
parent | 17e2769b254a0c5ecf45c118578a849ac43aceb5 (diff) | |
download | chromium_src-86fef131473cc05a460388193b01215130cf5866.zip chromium_src-86fef131473cc05a460388193b01215130cf5866.tar.gz chromium_src-86fef131473cc05a460388193b01215130cf5866.tar.bz2 |
Linux/ChromeOS Chromium style checker cleanup, gpu/ edition.
Automated clean up of style checker errors that were missed due to the plugin
not being executed on implementation files.
BUG=115047
Review URL: https://chromiumcodereview.appspot.com/12245002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180996 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
11 files changed, 23 insertions, 23 deletions
diff --git a/gpu/command_buffer/client/gles2_implementation_unittest.cc b/gpu/command_buffer/client/gles2_implementation_unittest.cc index 2ffe778..e99f301 100644 --- a/gpu/command_buffer/client/gles2_implementation_unittest.cc +++ b/gpu/command_buffer/client/gles2_implementation_unittest.cc @@ -114,7 +114,7 @@ class MockTransferBuffer : public TransferBufferInterface { virtual ~MockTransferBuffer() { } - bool Initialize( + virtual bool Initialize( unsigned int starting_buffer_size, unsigned int result_size, unsigned int /* min_buffer_size */, diff --git a/gpu/command_buffer/service/common_decoder_unittest.cc b/gpu/command_buffer/service/common_decoder_unittest.cc index a10fc78..d90e34b 100644 --- a/gpu/command_buffer/service/common_decoder_unittest.cc +++ b/gpu/command_buffer/service/common_decoder_unittest.cc @@ -51,15 +51,15 @@ TEST(CommonDecoderBucket, SetData) { class TestCommonDecoder : public CommonDecoder { public: // Overridden from AsyncAPIInterface - const char* GetCommandName(unsigned int command_id) const { + virtual const char* GetCommandName(unsigned int command_id) const OVERRIDE { return GetCommonCommandName(static_cast<cmd::CommandId>(command_id)); } // Overridden from AsyncAPIInterface - error::Error DoCommand( + virtual error::Error DoCommand( unsigned int command, unsigned int arg_count, - const void* cmd_data) { + const void* cmd_data) OVERRIDE { return DoCommonCommand(command, arg_count, cmd_data); } @@ -84,7 +84,7 @@ class MockCommandBufferEngine : public CommandBufferEngine { } // Overridden from CommandBufferEngine. - virtual Buffer GetSharedMemoryBuffer(int32 shm_id) { + virtual Buffer GetSharedMemoryBuffer(int32 shm_id) OVERRIDE { Buffer buffer; if (IsValidSharedMemoryId(shm_id)) { buffer.ptr = buffer_; @@ -107,7 +107,7 @@ class MockCommandBufferEngine : public CommandBufferEngine { } // Overridden from CommandBufferEngine. - virtual void set_token(int32 token) { + virtual void set_token(int32 token) OVERRIDE { token_ = token; } @@ -116,13 +116,13 @@ class MockCommandBufferEngine : public CommandBufferEngine { } // Overridden from CommandBufferEngine. - virtual bool SetGetBuffer(int32 transfer_buffer_id) { + virtual bool SetGetBuffer(int32 transfer_buffer_id) OVERRIDE { NOTREACHED(); return false; } // Overridden from CommandBufferEngine. - virtual bool SetGetOffset(int32 offset) { + virtual bool SetGetOffset(int32 offset) OVERRIDE { if (static_cast<size_t>(offset) < kBufferSize) { get_offset_ = offset; return true; @@ -131,7 +131,7 @@ class MockCommandBufferEngine : public CommandBufferEngine { } // Overridden from CommandBufferEngine. - virtual int32 GetGetOffset() { + virtual int32 GetGetOffset() OVERRIDE { return get_offset_; } diff --git a/gpu/command_buffer/service/framebuffer_manager_unittest.cc b/gpu/command_buffer/service/framebuffer_manager_unittest.cc index c817da4..e7f8467 100644 --- a/gpu/command_buffer/service/framebuffer_manager_unittest.cc +++ b/gpu/command_buffer/service/framebuffer_manager_unittest.cc @@ -26,7 +26,7 @@ class FramebufferManagerTest : public testing::Test { renderbuffer_manager_(NULL, kMaxRenderbufferSize, kMaxSamples) { } - ~FramebufferManagerTest() { + virtual ~FramebufferManagerTest() { manager_.Destroy(false); texture_manager_.Destroy(false); renderbuffer_manager_.Destroy(false); @@ -119,7 +119,7 @@ class FramebufferInfoTest : public testing::Test { NULL, new FeatureInfo(), kMaxTextureSize, kMaxCubemapSize), renderbuffer_manager_(NULL, kMaxRenderbufferSize, kMaxSamples) { } - ~FramebufferInfoTest() { + virtual ~FramebufferInfoTest() { manager_.Destroy(false); texture_manager_.Destroy(false); renderbuffer_manager_.Destroy(false); diff --git a/gpu/command_buffer/service/memory_program_cache_unittest.cc b/gpu/command_buffer/service/memory_program_cache_unittest.cc index 7755fcd..01bae9a 100644 --- a/gpu/command_buffer/service/memory_program_cache_unittest.cc +++ b/gpu/command_buffer/service/memory_program_cache_unittest.cc @@ -75,7 +75,7 @@ class MemoryProgramCacheTest : public testing::Test { : cache_(new MemoryProgramCache(kCacheSizeBytes)), vertex_shader_(NULL), fragment_shader_(NULL) { } - ~MemoryProgramCacheTest() { + virtual ~MemoryProgramCacheTest() { shader_manager_.Destroy(false); } diff --git a/gpu/command_buffer/service/program_manager_unittest.cc b/gpu/command_buffer/service/program_manager_unittest.cc index 4b5f4a6..6c852e1 100644 --- a/gpu/command_buffer/service/program_manager_unittest.cc +++ b/gpu/command_buffer/service/program_manager_unittest.cc @@ -37,7 +37,7 @@ namespace gles2 { class ProgramManagerTest : public testing::Test { public: ProgramManagerTest() : manager_(NULL) { } - ~ProgramManagerTest() { + virtual ~ProgramManagerTest() { manager_.Destroy(false); } @@ -138,7 +138,7 @@ class ProgramManagerWithShaderTest : public testing::Test { : manager_(NULL), program_info_(NULL) { } - ~ProgramManagerWithShaderTest() { + virtual ~ProgramManagerWithShaderTest() { manager_.Destroy(false); shader_manager_.Destroy(false); } @@ -1165,7 +1165,7 @@ class ProgramManagerWithCacheTest : public testing::Test { fragment_shader_(NULL), program_info_(NULL) { } - ~ProgramManagerWithCacheTest() { + virtual ~ProgramManagerWithCacheTest() { manager_.Destroy(false); shader_manager_.Destroy(false); } diff --git a/gpu/command_buffer/service/query_manager_unittest.cc b/gpu/command_buffer/service/query_manager_unittest.cc index 51bd462..712e7d9 100644 --- a/gpu/command_buffer/service/query_manager_unittest.cc +++ b/gpu/command_buffer/service/query_manager_unittest.cc @@ -32,7 +32,7 @@ class QueryManagerTest : public testing::Test { QueryManagerTest() { } - ~QueryManagerTest() { + virtual ~QueryManagerTest() { } protected: diff --git a/gpu/command_buffer/service/shader_manager_unittest.cc b/gpu/command_buffer/service/shader_manager_unittest.cc index 5faad87..7974e37 100644 --- a/gpu/command_buffer/service/shader_manager_unittest.cc +++ b/gpu/command_buffer/service/shader_manager_unittest.cc @@ -20,7 +20,7 @@ class ShaderManagerTest : public testing::Test { ShaderManagerTest() { } - ~ShaderManagerTest() { + virtual ~ShaderManagerTest() { manager_.Destroy(false); } diff --git a/gpu/command_buffer/service/shader_translator_unittest.cc b/gpu/command_buffer/service/shader_translator_unittest.cc index 3f8d172..469028d 100644 --- a/gpu/command_buffer/service/shader_translator_unittest.cc +++ b/gpu/command_buffer/service/shader_translator_unittest.cc @@ -13,7 +13,7 @@ class ShaderTranslatorTest : public testing::Test { ShaderTranslatorTest() { } - ~ShaderTranslatorTest() { + virtual ~ShaderTranslatorTest() { } protected: diff --git a/gpu/command_buffer/service/texture_manager_unittest.cc b/gpu/command_buffer/service/texture_manager_unittest.cc index 5484705..5e9b3da 100644 --- a/gpu/command_buffer/service/texture_manager_unittest.cc +++ b/gpu/command_buffer/service/texture_manager_unittest.cc @@ -34,11 +34,11 @@ class TextureManagerTest : public testing::Test { : feature_info_(new FeatureInfo()) { } - ~TextureManagerTest() { + virtual ~TextureManagerTest() { } protected: - void SetUp() { + virtual void SetUp() { gl_.reset(new ::testing::StrictMock< ::gfx::MockGLInterface>()); ::gfx::GLInterface::SetGLInterface(gl_.get()); @@ -345,7 +345,7 @@ class TextureInfoTestBase : public testing::Test { TextureInfoTestBase() : feature_info_(new FeatureInfo()) { } - ~TextureInfoTestBase() { + virtual ~TextureInfoTestBase() { info_ = NULL; } diff --git a/gpu/command_buffer/service/vertex_array_manager_unittest.cc b/gpu/command_buffer/service/vertex_array_manager_unittest.cc index 48712ac..50ce077 100644 --- a/gpu/command_buffer/service/vertex_array_manager_unittest.cc +++ b/gpu/command_buffer/service/vertex_array_manager_unittest.cc @@ -24,7 +24,7 @@ class VertexArrayManagerTest : public testing::Test { VertexArrayManagerTest() { } - ~VertexArrayManagerTest() { + virtual ~VertexArrayManagerTest() { } protected: diff --git a/gpu/command_buffer/service/vertex_attrib_manager_unittest.cc b/gpu/command_buffer/service/vertex_attrib_manager_unittest.cc index 07b1521..8bcd296 100644 --- a/gpu/command_buffer/service/vertex_attrib_manager_unittest.cc +++ b/gpu/command_buffer/service/vertex_attrib_manager_unittest.cc @@ -23,7 +23,7 @@ class VertexAttribManagerTest : public testing::Test { VertexAttribManagerTest() { } - ~VertexAttribManagerTest() { + virtual ~VertexAttribManagerTest() { } protected: |