diff options
Diffstat (limited to 'gpu/command_buffer')
63 files changed, 181 insertions, 257 deletions
diff --git a/gpu/command_buffer/client/buffer_tracker_unittest.cc b/gpu/command_buffer/client/buffer_tracker_unittest.cc index a244009..a928396 100644 --- a/gpu/command_buffer/client/buffer_tracker_unittest.cc +++ b/gpu/command_buffer/client/buffer_tracker_unittest.cc @@ -53,7 +53,7 @@ class BufferTrackerTest : public testing::Test { static const int32 kCommandBufferSizeBytes = kNumCommandEntries * sizeof(CommandBufferEntry); - virtual void SetUp() { + void SetUp() override { command_buffer_.reset(new MockClientCommandBufferImpl()); helper_.reset(new GLES2CmdHelper(command_buffer_.get())); helper_->Initialize(kCommandBufferSizeBytes); @@ -62,7 +62,7 @@ class BufferTrackerTest : public testing::Test { buffer_tracker_.reset(new BufferTracker(mapped_memory_.get())); } - virtual void TearDown() { + void TearDown() override { buffer_tracker_.reset(); mapped_memory_.reset(); helper_.reset(); diff --git a/gpu/command_buffer/client/fenced_allocator_test.cc b/gpu/command_buffer/client/fenced_allocator_test.cc index e746be6..3af9367 100644 --- a/gpu/command_buffer/client/fenced_allocator_test.cc +++ b/gpu/command_buffer/client/fenced_allocator_test.cc @@ -37,7 +37,7 @@ class BaseFencedAllocatorTest : public testing::Test { static const unsigned int kBufferSize = 1024; static const int kAllocAlignment = 16; - virtual void SetUp() { + void SetUp() override { api_mock_.reset(new AsyncAPIMock(true)); // ignore noops in the mock - we don't want to inspect the internals of the // helper. @@ -100,14 +100,14 @@ void EmptyPoll() { // and SetToken are properly forwarded to the engine. class FencedAllocatorTest : public BaseFencedAllocatorTest { protected: - virtual void SetUp() { + void SetUp() override { BaseFencedAllocatorTest::SetUp(); allocator_.reset(new FencedAllocator(kBufferSize, helper_.get(), base::Bind(&EmptyPoll))); } - virtual void TearDown() { + void TearDown() override { // If the GpuScheduler posts any tasks, this forces them to run. base::MessageLoop::current()->RunUntilIdle(); @@ -463,7 +463,7 @@ TEST_F(FencedAllocatorPollTest, TestPoll) { // forwarded to the engine. class FencedAllocatorWrapperTest : public BaseFencedAllocatorTest { protected: - virtual void SetUp() { + void SetUp() override { BaseFencedAllocatorTest::SetUp(); // Though allocating this buffer isn't strictly necessary, it makes @@ -477,7 +477,7 @@ class FencedAllocatorWrapperTest : public BaseFencedAllocatorTest { buffer_.get())); } - virtual void TearDown() { + void TearDown() override { // If the GpuScheduler posts any tasks, this forces them to run. base::MessageLoop::current()->RunUntilIdle(); diff --git a/gpu/command_buffer/client/gles2_implementation_autogen.h b/gpu/command_buffer/client/gles2_implementation_autogen.h index 3ef98dd..4e547d9 100644 --- a/gpu/command_buffer/client/gles2_implementation_autogen.h +++ b/gpu/command_buffer/client/gles2_implementation_autogen.h @@ -691,6 +691,6 @@ void MatrixLoadfCHROMIUM(GLenum matrixMode, const GLfloat* m) override; void MatrixLoadIdentityCHROMIUM(GLenum matrixMode) override; -virtual void BlendBarrierKHR() override; +void BlendBarrierKHR() override; #endif // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_AUTOGEN_H_ diff --git a/gpu/command_buffer/client/gles2_implementation_unittest.cc b/gpu/command_buffer/client/gles2_implementation_unittest.cc index 7b3ec2d..4102060 100644 --- a/gpu/command_buffer/client/gles2_implementation_unittest.cc +++ b/gpu/command_buffer/client/gles2_implementation_unittest.cc @@ -504,8 +504,8 @@ class GLES2ImplementationTest : public testing::Test { GLES2ImplementationTest() : commands_(NULL) {} - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; bool NoCommandsWritten() { scoped_refptr<Buffer> ring_buffer = helper_->get_ring_buffer(); @@ -628,12 +628,12 @@ void GLES2ImplementationTest::TearDown() { class GLES2ImplementationManualInitTest : public GLES2ImplementationTest { protected: - virtual void SetUp() override {} + void SetUp() override {} }; class GLES2ImplementationStrictSharedTest : public GLES2ImplementationTest { protected: - virtual void SetUp() override; + void SetUp() override; template <class ResApi> void FlushGenerationTest() { diff --git a/gpu/command_buffer/client/mapped_memory_unittest.cc b/gpu/command_buffer/client/mapped_memory_unittest.cc index 963640a..9d5bada 100644 --- a/gpu/command_buffer/client/mapped_memory_unittest.cc +++ b/gpu/command_buffer/client/mapped_memory_unittest.cc @@ -33,7 +33,7 @@ class MappedMemoryTestBase : public testing::Test { protected: static const unsigned int kBufferSize = 1024; - virtual void SetUp() { + void SetUp() override { api_mock_.reset(new AsyncAPIMock(true)); // ignore noops in the mock - we don't want to inspect the internals of the // helper. @@ -98,7 +98,7 @@ void EmptyPoll() { class MemoryChunkTest : public MappedMemoryTestBase { protected: static const int32 kShmId = 123; - virtual void SetUp() { + void SetUp() override { MappedMemoryTestBase::SetUp(); scoped_ptr<base::SharedMemory> shared_memory(new base::SharedMemory()); shared_memory->CreateAndMapAnonymous(kBufferSize); @@ -109,7 +109,7 @@ class MemoryChunkTest : public MappedMemoryTestBase { base::Bind(&EmptyPoll))); } - virtual void TearDown() { + void TearDown() override { // If the GpuScheduler posts any tasks, this forces them to run. base::MessageLoop::current()->RunUntilIdle(); @@ -163,13 +163,13 @@ class MappedMemoryManagerTest : public MappedMemoryTestBase { } protected: - virtual void SetUp() { + void SetUp() override { MappedMemoryTestBase::SetUp(); manager_.reset(new MappedMemoryManager( helper_.get(), base::Bind(&EmptyPoll), MappedMemoryManager::kNoLimit)); } - virtual void TearDown() { + void TearDown() override { // If the GpuScheduler posts any tasks, this forces them to run. base::MessageLoop::current()->RunUntilIdle(); manager_.reset(); diff --git a/gpu/command_buffer/client/program_info_manager_unittest.cc b/gpu/command_buffer/client/program_info_manager_unittest.cc index e5002fd..ba62703 100644 --- a/gpu/command_buffer/client/program_info_manager_unittest.cc +++ b/gpu/command_buffer/client/program_info_manager_unittest.cc @@ -14,11 +14,9 @@ namespace gles2 { class ProgramInfoManagerTest : public testing::Test { protected: - virtual void SetUp() { - } + void SetUp() override {} - virtual void TearDown() { - } + void TearDown() override {} scoped_ptr<ProgramInfoManager> program_info_manager_; }; diff --git a/gpu/command_buffer/client/query_tracker_unittest.cc b/gpu/command_buffer/client/query_tracker_unittest.cc index cd2ccf6..53f5195 100644 --- a/gpu/command_buffer/client/query_tracker_unittest.cc +++ b/gpu/command_buffer/client/query_tracker_unittest.cc @@ -29,7 +29,7 @@ class QuerySyncManagerTest : public testing::Test { static const int32 kCommandBufferSizeBytes = kNumCommandEntries * sizeof(CommandBufferEntry); - virtual void SetUp() { + void SetUp() override { command_buffer_.reset(new MockClientCommandBuffer()); helper_.reset(new GLES2CmdHelper(command_buffer_.get())); helper_->Initialize(kCommandBufferSizeBytes); @@ -38,7 +38,7 @@ class QuerySyncManagerTest : public testing::Test { sync_manager_.reset(new QuerySyncManager(mapped_memory_.get())); } - virtual void TearDown() { + void TearDown() override { sync_manager_.reset(); mapped_memory_.reset(); helper_.reset(); @@ -83,7 +83,7 @@ class QueryTrackerTest : public testing::Test { static const int32 kCommandBufferSizeBytes = kNumCommandEntries * sizeof(CommandBufferEntry); - virtual void SetUp() { + void SetUp() override { command_buffer_.reset(new MockClientCommandBuffer()); helper_.reset(new GLES2CmdHelper(command_buffer_.get())); helper_->Initialize(kCommandBufferSizeBytes); @@ -92,7 +92,7 @@ class QueryTrackerTest : public testing::Test { query_tracker_.reset(new QueryTracker(mapped_memory_.get())); } - virtual void TearDown() { + void TearDown() override { query_tracker_.reset(); mapped_memory_.reset(); helper_.reset(); diff --git a/gpu/command_buffer/client/ring_buffer_test.cc b/gpu/command_buffer/client/ring_buffer_test.cc index b3aca13..c1aab88 100644 --- a/gpu/command_buffer/client/ring_buffer_test.cc +++ b/gpu/command_buffer/client/ring_buffer_test.cc @@ -58,7 +58,7 @@ class BaseRingBufferTest : public testing::Test { api_mock_->SetToken(cmd::kSetToken, 1, _args); } - virtual void SetUp() { + void SetUp() override { delay_set_token_ = false; api_mock_.reset(new AsyncAPIMock(true)); // ignore noops in the mock - we don't want to inspect the internals of the @@ -123,7 +123,7 @@ const unsigned int BaseRingBufferTest::kBufferSize; // and SetToken are properly forwarded to the engine. class RingBufferTest : public BaseRingBufferTest { protected: - virtual void SetUp() { + void SetUp() override { BaseRingBufferTest::SetUp(); buffer_.reset(new int8[kBufferSize + kBaseOffset]); @@ -132,7 +132,7 @@ class RingBufferTest : public BaseRingBufferTest { helper_.get(), buffer_start_)); } - virtual void TearDown() { + void TearDown() override { // If the GpuScheduler posts any tasks, this forces them to run. base::MessageLoop::current()->RunUntilIdle(); diff --git a/gpu/command_buffer/client/transfer_buffer_unittest.cc b/gpu/command_buffer/client/transfer_buffer_unittest.cc index 4e99ba9..7dac4f5 100644 --- a/gpu/command_buffer/client/transfer_buffer_unittest.cc +++ b/gpu/command_buffer/client/transfer_buffer_unittest.cc @@ -36,8 +36,8 @@ class TransferBufferTest : public testing::Test { : transfer_buffer_id_(0) { } - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; virtual void Initialize(unsigned int size_to_flush) { ASSERT_TRUE(transfer_buffer_->Initialize( @@ -248,8 +248,8 @@ class TransferBufferExpandContractTest : public testing::Test { : transfer_buffer_id_(0) { } - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; MockClientCommandBufferCanFail* command_buffer() const { return command_buffer_.get(); diff --git a/gpu/command_buffer/client/vertex_array_object_manager_unittest.cc b/gpu/command_buffer/client/vertex_array_object_manager_unittest.cc index b3ac065..e891184 100644 --- a/gpu/command_buffer/client/vertex_array_object_manager_unittest.cc +++ b/gpu/command_buffer/client/vertex_array_object_manager_unittest.cc @@ -16,14 +16,13 @@ class VertexArrayObjectManagerTest : public testing::Test { static const GLuint kClientSideArrayBuffer = 0x1234; static const GLuint kClientSideElementArrayBuffer = 0x1235; - virtual void SetUp() { + void SetUp() override { manager_.reset(new VertexArrayObjectManager( kMaxAttribs, kClientSideArrayBuffer, kClientSideElementArrayBuffer)); } - virtual void TearDown() { - } + void TearDown() override {} scoped_ptr<VertexArrayObjectManager> manager_; }; diff --git a/gpu/command_buffer/common/command_buffer_shared_test.cc b/gpu/command_buffer/common/command_buffer_shared_test.cc index d2c599a..65a2429 100644 --- a/gpu/command_buffer/common/command_buffer_shared_test.cc +++ b/gpu/command_buffer/common/command_buffer_shared_test.cc @@ -14,8 +14,7 @@ namespace gpu { class CommandBufferSharedTest : public testing::Test { protected: - - virtual void SetUp() { + void SetUp() override { shared_state_.reset(new CommandBufferSharedState()); shared_state_->Initialize(); } diff --git a/gpu/command_buffer/common/debug_marker_manager_unittest.cc b/gpu/command_buffer/common/debug_marker_manager_unittest.cc index fa1cfcc..7852c77 100644 --- a/gpu/command_buffer/common/debug_marker_manager_unittest.cc +++ b/gpu/command_buffer/common/debug_marker_manager_unittest.cc @@ -11,11 +11,9 @@ namespace gles2 { class DebugMarkerManagerTest : public testing::Test { protected: - virtual void SetUp() { - } + void SetUp() override {} - virtual void TearDown() { - } + void TearDown() override {} DebugMarkerManager manager_; }; diff --git a/gpu/command_buffer/common/gles2_cmd_format_test.cc b/gpu/command_buffer/common/gles2_cmd_format_test.cc index 717e6fb..ea683a6 100644 --- a/gpu/command_buffer/common/gles2_cmd_format_test.cc +++ b/gpu/command_buffer/common/gles2_cmd_format_test.cc @@ -19,12 +19,9 @@ class GLES2FormatTest : public testing::Test { protected: static const unsigned char kInitialValue = 0xBD; - virtual void SetUp() { - memset(buffer_, kInitialValue, sizeof(buffer_)); - } + void SetUp() override { memset(buffer_, kInitialValue, sizeof(buffer_)); } - virtual void TearDown() { - } + void TearDown() override {} template <typename T> T* GetBufferAs() { diff --git a/gpu/command_buffer/common/id_allocator_test.cc b/gpu/command_buffer/common/id_allocator_test.cc index 5d32e40..adeed5b 100644 --- a/gpu/command_buffer/common/id_allocator_test.cc +++ b/gpu/command_buffer/common/id_allocator_test.cc @@ -11,8 +11,8 @@ namespace gpu { class IdAllocatorTest : public testing::Test { protected: - virtual void SetUp() {} - virtual void TearDown() {} + void SetUp() override {} + void TearDown() override {} IdAllocator* id_allocator() { return &id_allocator_; } diff --git a/gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc b/gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc index 1e4066f..34e3a37 100644 --- a/gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc +++ b/gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc @@ -93,11 +93,9 @@ class TransferThread : public base::Thread { SetPriority(base::kThreadPriority_Background); #endif } - virtual ~TransferThread() { - Stop(); - } + ~TransferThread() override { Stop(); } - virtual void Init() override { + void Init() override { gfx::GLShareGroup* share_group = NULL; surface_ = new gfx::PbufferGLSurfaceEGL(gfx::Size(1, 1)); surface_->Initialize(); @@ -107,7 +105,7 @@ class TransferThread : public base::Thread { DCHECK(is_current); } - virtual void CleanUp() override { + void CleanUp() override { surface_ = NULL; context_->ReleaseCurrent(surface_.get()); context_ = NULL; @@ -401,20 +399,18 @@ class AsyncPixelTransferDelegateEGL AsyncPixelTransferManagerEGL::SharedState* shared_state, GLuint texture_id, const AsyncTexImage2DParams& define_params); - virtual ~AsyncPixelTransferDelegateEGL(); + ~AsyncPixelTransferDelegateEGL() override; void BindTransfer() { state_->BindTransfer(); } // Implement AsyncPixelTransferDelegate: - virtual void AsyncTexImage2D( - const AsyncTexImage2DParams& tex_params, - const AsyncMemoryParams& mem_params, - const base::Closure& bind_callback) override; - virtual void AsyncTexSubImage2D( - const AsyncTexSubImage2DParams& tex_params, - const AsyncMemoryParams& mem_params) override; - virtual bool TransferIsInProgress() override; - virtual void WaitForTransferCompletion() override; + void AsyncTexImage2D(const AsyncTexImage2DParams& tex_params, + const AsyncMemoryParams& mem_params, + const base::Closure& bind_callback) override; + void AsyncTexSubImage2D(const AsyncTexSubImage2DParams& tex_params, + const AsyncMemoryParams& mem_params) override; + bool TransferIsInProgress() override; + void WaitForTransferCompletion() override; private: // Returns true if a work-around was used. diff --git a/gpu/command_buffer/service/async_pixel_transfer_manager_egl.h b/gpu/command_buffer/service/async_pixel_transfer_manager_egl.h index dc6798b..0b74216 100644 --- a/gpu/command_buffer/service/async_pixel_transfer_manager_egl.h +++ b/gpu/command_buffer/service/async_pixel_transfer_manager_egl.h @@ -16,18 +16,18 @@ class AsyncPixelTransferUploadStats; class AsyncPixelTransferManagerEGL : public AsyncPixelTransferManager { public: AsyncPixelTransferManagerEGL(); - virtual ~AsyncPixelTransferManagerEGL(); + ~AsyncPixelTransferManagerEGL() override; // AsyncPixelTransferManager implementation: - virtual void BindCompletedAsyncTransfers() override; - virtual void AsyncNotifyCompletion( + void BindCompletedAsyncTransfers() override; + void AsyncNotifyCompletion( const AsyncMemoryParams& mem_params, AsyncPixelTransferCompletionObserver* observer) override; - virtual uint32 GetTextureUploadCount() override; - virtual base::TimeDelta GetTotalTextureUploadTime() override; - virtual void ProcessMorePendingTransfers() override; - virtual bool NeedsProcessMorePendingTransfers() override; - virtual void WaitAllAsyncTexImage2D() override; + uint32 GetTextureUploadCount() override; + base::TimeDelta GetTotalTextureUploadTime() override; + void ProcessMorePendingTransfers() override; + bool NeedsProcessMorePendingTransfers() override; + void WaitAllAsyncTexImage2D() override; // State shared between Managers and Delegates. struct SharedState { @@ -44,7 +44,7 @@ class AsyncPixelTransferManagerEGL : public AsyncPixelTransferManager { private: // AsyncPixelTransferManager implementation: - virtual AsyncPixelTransferDelegate* CreatePixelTransferDelegateImpl( + AsyncPixelTransferDelegate* CreatePixelTransferDelegateImpl( gles2::TextureRef* ref, const AsyncTexImage2DParams& define_params) override; diff --git a/gpu/command_buffer/service/buffer_manager_unittest.cc b/gpu/command_buffer/service/buffer_manager_unittest.cc index 77f32dc..5c24eb0 100644 --- a/gpu/command_buffer/service/buffer_manager_unittest.cc +++ b/gpu/command_buffer/service/buffer_manager_unittest.cc @@ -33,7 +33,7 @@ class BufferManagerTestBase : public GpuServiceTest { manager_.reset(new BufferManager(memory_tracker, feature_info)); } - virtual void TearDown() { + void TearDown() override { manager_->Destroy(false); manager_.reset(); error_state_.reset(); @@ -78,14 +78,12 @@ class BufferManagerTestBase : public GpuServiceTest { class BufferManagerTest : public BufferManagerTestBase { protected: - virtual void SetUp() { - SetUpBase(NULL, NULL, ""); - } + void SetUp() override { SetUpBase(NULL, NULL, ""); } }; class BufferManagerMemoryTrackerTest : public BufferManagerTestBase { protected: - virtual void SetUp() { + void SetUp() override { mock_memory_tracker_ = new StrictMock<MockMemoryTracker>(); SetUpBase(mock_memory_tracker_.get(), NULL, ""); } @@ -95,7 +93,7 @@ class BufferManagerMemoryTrackerTest : public BufferManagerTestBase { class BufferManagerClientSideArraysTest : public BufferManagerTestBase { protected: - virtual void SetUp() { + void SetUp() override { feature_info_ = new FeatureInfo(); feature_info_->workarounds_.use_client_side_arrays_for_stream_buffers = true; diff --git a/gpu/command_buffer/service/command_buffer_service_unittest.cc b/gpu/command_buffer/service/command_buffer_service_unittest.cc index 229aafa..3af2d05 100644 --- a/gpu/command_buffer/service/command_buffer_service_unittest.cc +++ b/gpu/command_buffer/service/command_buffer_service_unittest.cc @@ -22,7 +22,7 @@ namespace gpu { class CommandBufferServiceTest : public testing::Test { protected: - virtual void SetUp() { + void SetUp() override { { TransferBufferManager* manager = new TransferBufferManager(); transfer_buffer_manager_.reset(manager); diff --git a/gpu/command_buffer/service/common_decoder_unittest.cc b/gpu/command_buffer/service/common_decoder_unittest.cc index aa1ed1b..5be7eea 100644 --- a/gpu/command_buffer/service/common_decoder_unittest.cc +++ b/gpu/command_buffer/service/common_decoder_unittest.cc @@ -151,12 +151,9 @@ const int32 MockCommandBufferEngine::kInvalidOffset; class CommonDecoderTest : public testing::Test { protected: - virtual void SetUp() { - decoder_.set_engine(&engine_); - } + void SetUp() override { decoder_.set_engine(&engine_); } - virtual void TearDown() { - } + void TearDown() override {} template <typename T> error::Error ExecuteCmd(const T& cmd) { diff --git a/gpu/command_buffer/service/context_group_unittest.cc b/gpu/command_buffer/service/context_group_unittest.cc index 7aa1301..13e5dc8 100644 --- a/gpu/command_buffer/service/context_group_unittest.cc +++ b/gpu/command_buffer/service/context_group_unittest.cc @@ -35,7 +35,7 @@ class ContextGroupTest : public GpuServiceTest { ContextGroupTest() {} protected: - virtual void SetUp() { + void SetUp() override { GpuServiceTest::SetUp(); decoder_.reset(new MockGLES2Decoder()); group_ = scoped_refptr<ContextGroup>( diff --git a/gpu/command_buffer/service/feature_info_unittest.cc b/gpu/command_buffer/service/feature_info_unittest.cc index a97188f..69bd4d3 100644 --- a/gpu/command_buffer/service/feature_info_unittest.cc +++ b/gpu/command_buffer/service/feature_info_unittest.cc @@ -74,11 +74,11 @@ class FeatureInfoTest : public GpuServiceTest { } protected: - virtual void SetUp() override { + void SetUp() override { // Do nothing here, since we are using the explicit Setup*() functions. } - virtual void TearDown() override { + void TearDown() override { info_ = NULL; GpuServiceTest::TearDown(); } diff --git a/gpu/command_buffer/service/framebuffer_manager_unittest.cc b/gpu/command_buffer/service/framebuffer_manager_unittest.cc index 1ded558..88567b7 100644 --- a/gpu/command_buffer/service/framebuffer_manager_unittest.cc +++ b/gpu/command_buffer/service/framebuffer_manager_unittest.cc @@ -43,7 +43,7 @@ class FramebufferManagerTest : public GpuServiceTest { kMaxRenderbufferSize, kMaxSamples, kDepth24Supported) {} - virtual ~FramebufferManagerTest() { + ~FramebufferManagerTest() override { manager_.Destroy(false); texture_manager_.Destroy(false); renderbuffer_manager_.Destroy(false); @@ -116,16 +116,14 @@ class FramebufferInfoTest : public GpuServiceTest { kMaxCubemapSize, kUseDefaultTextures)); } - virtual ~FramebufferInfoTest() { + ~FramebufferInfoTest() override { manager_.Destroy(false); texture_manager_->Destroy(false); renderbuffer_manager_.Destroy(false); } protected: - virtual void SetUp() { - InitializeContext("", ""); - } + void SetUp() override { InitializeContext("", ""); } void InitializeContext(const char* gl_version, const char* extensions) { GpuServiceTest::SetUp(); @@ -673,11 +671,10 @@ class FramebufferInfoFloatTest : public FramebufferInfoTest { FramebufferInfoFloatTest() : FramebufferInfoTest() { } - virtual ~FramebufferInfoFloatTest() { - } + ~FramebufferInfoFloatTest() override {} protected: - virtual void SetUp() { + void SetUp() override { InitializeContext("OpenGL ES 3.0", "GL_OES_texture_float GL_EXT_color_buffer_float"); } diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.h index fea20ab..0ea7d4b 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.h +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.h @@ -57,7 +57,7 @@ class GLES2DecoderRGBBackbufferTest : public GLES2DecoderWithShaderTest { public: GLES2DecoderRGBBackbufferTest() {} - virtual void SetUp(); + void SetUp() override; }; class GLES2DecoderManualInitTest : public GLES2DecoderWithShaderTest { @@ -65,7 +65,7 @@ class GLES2DecoderManualInitTest : public GLES2DecoderWithShaderTest { GLES2DecoderManualInitTest() {} // Override default setup so nothing gets setup. - virtual void SetUp(); + void SetUp() override; void DirtyStateMaskTest(GLuint color_bits, bool depth_mask, diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_attribs.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_attribs.cc index 36b14e5..a858cf7 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_attribs.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_attribs.cc @@ -233,7 +233,7 @@ class GLES2DecoderVertexArraysOESTest : public GLES2DecoderWithShaderTest { bool vertex_array_deleted_manually_; - virtual void SetUp() { + void SetUp() override { InitState init; init.gl_version = "opengl es 2.0"; init.bind_generates_resource = true; @@ -246,7 +246,7 @@ class GLES2DecoderVertexArraysOESTest : public GLES2DecoderWithShaderTest { vertex_array_deleted_manually_ = false; } - virtual void TearDown() { + void TearDown() override { // This should only be set if the test handled deletion of the vertex array // itself. Necessary because vertex_array_objects are not sharable, and thus // not managed in the ContextGroup, meaning they will be destroyed during @@ -355,7 +355,7 @@ class GLES2DecoderEmulatedVertexArraysOESTest public: GLES2DecoderEmulatedVertexArraysOESTest() {} - virtual void SetUp() { + void SetUp() override { InitState init; init.gl_version = "3.0"; init.bind_generates_resource = true; diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h index 1e7db3f..1507440 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h @@ -69,8 +69,8 @@ class GLES2DecoderTestBase : public ::testing::TestWithParam<bool> { engine_->ClearSharedMemory(); } - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; template <typename T> error::Error ExecuteCmd(const T& cmd) { @@ -627,9 +627,8 @@ class GLES2DecoderWithShaderTestBase : public GLES2DecoderTestBase { } protected: - virtual void SetUp() override; - virtual void TearDown() override; - + void SetUp() override; + void TearDown() override; }; // SpecializedSetup specializations that are needed in multiple unittest files. diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_drawing.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_drawing.cc index 4ee12ff..0bfefd4 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_drawing.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_drawing.cc @@ -57,7 +57,7 @@ class GLES2DecoderGeometryInstancingTest : public GLES2DecoderWithShaderTest { public: GLES2DecoderGeometryInstancingTest() : GLES2DecoderWithShaderTest() {} - virtual void SetUp() { + void SetUp() override { InitState init; init.extensions = "GL_ANGLE_instanced_arrays"; init.gl_version = "opengl es 2.0"; diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_extensions.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_extensions.cc index ac80190..f87a4bd 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_extensions.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_extensions.cc @@ -19,7 +19,7 @@ namespace gles2 { class GLES2DecoderTestWithCHROMIUMPathRendering : public GLES2DecoderTest { public: GLES2DecoderTestWithCHROMIUMPathRendering() {} - virtual void SetUp() override { + void SetUp() override { InitState init; init.gl_version = "opengl es 3.1"; init.has_alpha = true; @@ -39,7 +39,7 @@ INSTANTIATE_TEST_CASE_P(Service, class GLES2DecoderTestWithBlendEquationAdvanced : public GLES2DecoderTest { public: GLES2DecoderTestWithBlendEquationAdvanced() {} - virtual void SetUp() override { + void SetUp() override { InitState init; init.gl_version = "opengl es 2.0"; init.has_alpha = true; diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc index ce8f307..d555f28 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc @@ -57,7 +57,7 @@ class GLES2DecoderTestWithExtensionsOnGLES2 : public GLES2DecoderTest { public: GLES2DecoderTestWithExtensionsOnGLES2() {} - virtual void SetUp() {} + void SetUp() override {} void Init(const char* extensions) { InitState init; init.extensions = extensions; diff --git a/gpu/command_buffer/service/gpu_scheduler_unittest.cc b/gpu/command_buffer/service/gpu_scheduler_unittest.cc index c658d2b..d8233ec 100644 --- a/gpu/command_buffer/service/gpu_scheduler_unittest.cc +++ b/gpu/command_buffer/service/gpu_scheduler_unittest.cc @@ -32,7 +32,7 @@ class GpuSchedulerTest : public testing::Test { protected: static const int32 kTransferBufferId = 123; - virtual void SetUp() { + void SetUp() override { scoped_ptr<base::SharedMemory> shared_memory(new ::base::SharedMemory); shared_memory->CreateAndMapAnonymous(kRingBufferSize); buffer_ = static_cast<int32*>(shared_memory->memory()); @@ -62,7 +62,7 @@ class GpuSchedulerTest : public testing::Test { EXPECT_TRUE(scheduler_->SetGetBuffer(kTransferBufferId)); } - virtual void TearDown() { + void TearDown() override { // Ensure that any unexpected tasks posted by the GPU scheduler are executed // in order to fail the test. base::MessageLoop::current()->RunUntilIdle(); diff --git a/gpu/command_buffer/service/gpu_service_test.h b/gpu/command_buffer/service/gpu_service_test.h index 189031c..539d6ba 100644 --- a/gpu/command_buffer/service/gpu_service_test.h +++ b/gpu/command_buffer/service/gpu_service_test.h @@ -22,12 +22,12 @@ namespace gles2 { class GpuServiceTest : public testing::Test { public: GpuServiceTest(); - virtual ~GpuServiceTest(); + ~GpuServiceTest() override; protected: void SetUpWithGLVersion(const char* gl_version, const char* gl_extensions); - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; scoped_ptr< ::testing::StrictMock< ::gfx::MockGLInterface> > gl_; diff --git a/gpu/command_buffer/service/gpu_tracer_unittest.cc b/gpu/command_buffer/service/gpu_tracer_unittest.cc index fe353c3..59ea63e 100644 --- a/gpu/command_buffer/service/gpu_tracer_unittest.cc +++ b/gpu/command_buffer/service/gpu_tracer_unittest.cc @@ -163,12 +163,12 @@ class BaseGpuTracerTest : public GpuServiceTest { } protected: - virtual void SetUp() { + void SetUp() override { GpuServiceTest::SetUp(); gl_fake_queries_.Reset(); } - virtual void TearDown() { + void TearDown() override { gl_.reset(); gl_fake_queries_.Reset(); GpuServiceTest::TearDown(); diff --git a/gpu/command_buffer/service/id_manager_unittest.cc b/gpu/command_buffer/service/id_manager_unittest.cc index 015a442..9a6e567 100644 --- a/gpu/command_buffer/service/id_manager_unittest.cc +++ b/gpu/command_buffer/service/id_manager_unittest.cc @@ -14,11 +14,9 @@ class IdManagerTest : public testing::Test { } protected: - virtual void SetUp() { - } + void SetUp() override {} - virtual void TearDown() { - } + void TearDown() override {} IdManager manager_; }; diff --git a/gpu/command_buffer/service/mailbox_manager_unittest.cc b/gpu/command_buffer/service/mailbox_manager_unittest.cc index 1aea4c5..231193f 100644 --- a/gpu/command_buffer/service/mailbox_manager_unittest.cc +++ b/gpu/command_buffer/service/mailbox_manager_unittest.cc @@ -20,10 +20,10 @@ using namespace ::testing; class MailboxManagerTest : public GpuServiceTest { public: MailboxManagerTest() {} - virtual ~MailboxManagerTest() {} + ~MailboxManagerTest() override {} protected: - virtual void SetUp() { + void SetUp() override { GpuServiceTest::SetUp(); feature_info_ = new FeatureInfo; manager_ = new MailboxManagerImpl; @@ -37,9 +37,7 @@ class MailboxManagerTest : public GpuServiceTest { DCHECK(manager_->UsesSync()); } - virtual void TearDown() { - GpuServiceTest::TearDown(); - } + void TearDown() override { GpuServiceTest::TearDown(); } Texture* CreateTexture() { return new Texture(1); @@ -190,10 +188,10 @@ const GLsizei kMaxTextureDepth = 1; class MailboxManagerSyncTest : public MailboxManagerTest { public: MailboxManagerSyncTest() {} - virtual ~MailboxManagerSyncTest() {} + ~MailboxManagerSyncTest() override {} protected: - virtual void SetUp() { + void SetUp() override { MailboxManagerTest::SetUpWithSynchronizer(); manager2_ = new MailboxManagerSync(); context_ = new gfx::GLContextStub(); @@ -257,7 +255,7 @@ class MailboxManagerSyncTest : public MailboxManagerTest { .RetiresOnSaturation(); } - virtual void TearDown() { + void TearDown() override { context_->ReleaseCurrent(NULL); MailboxManagerTest::TearDown(); } diff --git a/gpu/command_buffer/service/memory_program_cache_unittest.cc b/gpu/command_buffer/service/memory_program_cache_unittest.cc index 4ff3fe3..d3e954e 100644 --- a/gpu/command_buffer/service/memory_program_cache_unittest.cc +++ b/gpu/command_buffer/service/memory_program_cache_unittest.cc @@ -76,9 +76,7 @@ class MemoryProgramCacheTest : public GpuServiceTest { vertex_shader_(NULL), fragment_shader_(NULL), shader_cache_count_(0) { } - virtual ~MemoryProgramCacheTest() { - shader_manager_.Destroy(false); - } + ~MemoryProgramCacheTest() override { shader_manager_.Destroy(false); } void ShaderCacheCb(const std::string& key, const std::string& shader) { shader_cache_count_++; @@ -89,7 +87,7 @@ class MemoryProgramCacheTest : public GpuServiceTest { const std::string& shader_cache_shader() { return shader_cache_shader_; } protected: - virtual void SetUp() { + void SetUp() override { GpuServiceTest::SetUp(); vertex_shader_ = shader_manager_.CreateShader(kVertexShaderClientId, diff --git a/gpu/command_buffer/service/program_manager_unittest.cc b/gpu/command_buffer/service/program_manager_unittest.cc index 5d80694..3463db3 100644 --- a/gpu/command_buffer/service/program_manager_unittest.cc +++ b/gpu/command_buffer/service/program_manager_unittest.cc @@ -43,9 +43,7 @@ void ShaderCacheCb(const std::string& key, const std::string& shader) {} class ProgramManagerTest : public GpuServiceTest { public: ProgramManagerTest() : manager_(NULL, kMaxVaryingVectors) { } - virtual ~ProgramManagerTest() { - manager_.Destroy(false); - } + ~ProgramManagerTest() override { manager_.Destroy(false); } protected: ProgramManager manager_; @@ -131,7 +129,7 @@ class ProgramManagerWithShaderTest : public GpuServiceTest { : manager_(NULL, kMaxVaryingVectors), program_(NULL) { } - virtual ~ProgramManagerWithShaderTest() { + ~ProgramManagerWithShaderTest() override { manager_.Destroy(false); shader_manager_.Destroy(false); } @@ -215,7 +213,7 @@ class ProgramManagerWithShaderTest : public GpuServiceTest { VarCategory category; } VarInfo; - virtual void SetUp() { + void SetUp() override { GpuServiceTest::SetUp(); SetupDefaultShaderExpectations(); @@ -1579,13 +1577,13 @@ class ProgramManagerWithCacheTest : public GpuServiceTest { fragment_shader_(NULL), program_(NULL) { } - virtual ~ProgramManagerWithCacheTest() { + ~ProgramManagerWithCacheTest() override { manager_.Destroy(false); shader_manager_.Destroy(false); } protected: - virtual void SetUp() { + void SetUp() override { GpuServiceTest::SetUp(); vertex_shader_ = shader_manager_.CreateShader( diff --git a/gpu/command_buffer/service/query_manager_unittest.cc b/gpu/command_buffer/service/query_manager_unittest.cc index b4f1653..80efd69 100644 --- a/gpu/command_buffer/service/query_manager_unittest.cc +++ b/gpu/command_buffer/service/query_manager_unittest.cc @@ -34,11 +34,10 @@ class QueryManagerTest : public GpuServiceTest { QueryManagerTest() { } - virtual ~QueryManagerTest() { - } + ~QueryManagerTest() override {} protected: - virtual void SetUp() { + void SetUp() override { GpuServiceTest::SetUp(); engine_.reset(new MockCommandBufferEngine()); decoder_.reset(new MockGLES2Decoder()); @@ -51,7 +50,7 @@ class QueryManagerTest : public GpuServiceTest { manager_.reset(new QueryManager(decoder_.get(), feature_info.get())); } - virtual void TearDown() { + void TearDown() override { decoder_.reset(); manager_->Destroy(false); manager_.reset(); diff --git a/gpu/command_buffer/service/renderbuffer_manager_unittest.cc b/gpu/command_buffer/service/renderbuffer_manager_unittest.cc index ba0ebea..7c625e6 100644 --- a/gpu/command_buffer/service/renderbuffer_manager_unittest.cc +++ b/gpu/command_buffer/service/renderbuffer_manager_unittest.cc @@ -29,7 +29,7 @@ class RenderbufferManagerTestBase : public GpuServiceTest { memory_tracker, kMaxSize, kMaxSamples, depth24_supported)); } - virtual void TearDown() { + void TearDown() override { manager_->Destroy(true); manager_.reset(); GpuServiceTest::TearDown(); @@ -40,7 +40,7 @@ class RenderbufferManagerTestBase : public GpuServiceTest { class RenderbufferManagerTest : public RenderbufferManagerTestBase { protected: - virtual void SetUp() { + void SetUp() override { bool depth24_supported = false; SetUpBase(NULL, depth24_supported); } @@ -49,7 +49,7 @@ class RenderbufferManagerTest : public RenderbufferManagerTestBase { class RenderbufferManagerMemoryTrackerTest : public RenderbufferManagerTestBase { protected: - virtual void SetUp() { + void SetUp() override { mock_memory_tracker_ = new StrictMock<MockMemoryTracker>(); bool depth24_supported = false; SetUpBase(mock_memory_tracker_.get(), depth24_supported); @@ -293,7 +293,7 @@ TEST_F(RenderbufferManagerTest, AddToSignature) { class RenderbufferManagerFormatTest : public RenderbufferManagerTestBase { protected: - virtual void SetUp() { + void SetUp() override { bool depth24_supported = true; SetUpBase(NULL, depth24_supported); } diff --git a/gpu/command_buffer/service/shader_manager_unittest.cc b/gpu/command_buffer/service/shader_manager_unittest.cc index 717572b..4218d50 100644 --- a/gpu/command_buffer/service/shader_manager_unittest.cc +++ b/gpu/command_buffer/service/shader_manager_unittest.cc @@ -22,9 +22,7 @@ class ShaderManagerTest : public GpuServiceTest { ShaderManagerTest() { } - virtual ~ShaderManagerTest() { - manager_.Destroy(false); - } + ~ShaderManagerTest() override { manager_.Destroy(false); } protected: ShaderManager manager_; diff --git a/gpu/command_buffer/service/shader_translator_unittest.cc b/gpu/command_buffer/service/shader_translator_unittest.cc index 40d5be7..16c80a2 100644 --- a/gpu/command_buffer/service/shader_translator_unittest.cc +++ b/gpu/command_buffer/service/shader_translator_unittest.cc @@ -15,11 +15,10 @@ class ShaderTranslatorTest : public testing::Test { ShaderTranslatorTest() { } - virtual ~ShaderTranslatorTest() { - } + ~ShaderTranslatorTest() override {} protected: - virtual void SetUp() { + void SetUp() override { ShBuiltInResources resources; ShInitBuiltInResources(&resources); resources.MaxExpressionComplexity = 32; @@ -37,7 +36,7 @@ class ShaderTranslatorTest : public testing::Test { ShaderTranslatorInterface::kGlsl, static_cast<ShCompileOptions>(0))); } - virtual void TearDown() { + void TearDown() override { vertex_translator_ = NULL; fragment_translator_ = NULL; } diff --git a/gpu/command_buffer/service/texture_definition.cc b/gpu/command_buffer/service/texture_definition.cc index b0cafe2..edd4271 100644 --- a/gpu/command_buffer/service/texture_definition.cc +++ b/gpu/command_buffer/service/texture_definition.cc @@ -114,11 +114,11 @@ class NativeImageBufferEGL : public NativeImageBuffer { private: NativeImageBufferEGL(EGLDisplay display, EGLImageKHR image); - virtual ~NativeImageBufferEGL(); - virtual void AddClient(gfx::GLImage* client) override; - virtual void RemoveClient(gfx::GLImage* client) override; - virtual bool IsClient(gfx::GLImage* client) override; - virtual void BindToTexture(GLenum target) override; + ~NativeImageBufferEGL() override; + void AddClient(gfx::GLImage* client) override; + void RemoveClient(gfx::GLImage* client) override; + bool IsClient(gfx::GLImage* client) override; + void BindToTexture(GLenum target) override; EGLDisplay egl_display_; EGLImageKHR egl_image_; diff --git a/gpu/command_buffer/service/texture_manager_unittest.cc b/gpu/command_buffer/service/texture_manager_unittest.cc index 157138f..3278b4e 100644 --- a/gpu/command_buffer/service/texture_manager_unittest.cc +++ b/gpu/command_buffer/service/texture_manager_unittest.cc @@ -55,11 +55,10 @@ class TextureManagerTest : public GpuServiceTest { TextureManagerTest() : feature_info_(new FeatureInfo()) {} - virtual ~TextureManagerTest() { - } + ~TextureManagerTest() override {} protected: - virtual void SetUp() { + void SetUp() override { GpuServiceTest::SetUp(); manager_.reset(new TextureManager(NULL, feature_info_.get(), @@ -72,7 +71,7 @@ class TextureManagerTest : public GpuServiceTest { error_state_.reset(new ::testing::StrictMock<gles2::MockErrorState>()); } - virtual void TearDown() { + void TearDown() override { manager_->Destroy(false); manager_.reset(); GpuServiceTest::TearDown(); @@ -397,9 +396,7 @@ class TextureTestBase : public GpuServiceTest { TextureTestBase() : feature_info_(new FeatureInfo()) { } - virtual ~TextureTestBase() { - texture_ref_ = NULL; - } + ~TextureTestBase() override { texture_ref_ = NULL; } protected: void SetUpBase(MemoryTracker* memory_tracker, std::string extensions) { @@ -422,7 +419,7 @@ class TextureTestBase : public GpuServiceTest { ASSERT_TRUE(texture_ref_.get() != NULL); } - virtual void TearDown() { + void TearDown() override { if (texture_ref_.get()) { // If it's not in the manager then setting texture_ref_ to NULL will // delete the texture. @@ -456,14 +453,12 @@ class TextureTestBase : public GpuServiceTest { class TextureTest : public TextureTestBase { protected: - virtual void SetUp() { - SetUpBase(NULL, std::string()); - } + void SetUp() override { SetUpBase(NULL, std::string()); } }; class TextureMemoryTrackerTest : public TextureTestBase { protected: - virtual void SetUp() { + void SetUp() override { mock_memory_tracker_ = new StrictMock<MockMemoryTracker>(); SetUpBase(mock_memory_tracker_.get(), std::string()); } @@ -1871,7 +1866,7 @@ TEST_F(TextureTest, AddToSignature) { class ProduceConsumeTextureTest : public TextureTest, public ::testing::WithParamInterface<GLenum> { public: - virtual void SetUp() { + void SetUp() override { TextureTest::SetUpBase(NULL, "GL_OES_EGL_image_external"); manager_->CreateTexture(kClient2Id, kService2Id); texture2_ = manager_->GetTexture(kClient2Id); @@ -1880,7 +1875,7 @@ class ProduceConsumeTextureTest : public TextureTest, .WillRepeatedly(Return(error_state_.get())); } - virtual void TearDown() { + void TearDown() override { if (texture2_.get()) { // If it's not in the manager then setting texture2_ to NULL will // delete the texture. @@ -2194,10 +2189,9 @@ class SharedTextureTest : public GpuServiceTest { SharedTextureTest() : feature_info_(new FeatureInfo()) {} - virtual ~SharedTextureTest() { - } + ~SharedTextureTest() override {} - virtual void SetUp() { + void SetUp() override { GpuServiceTest::SetUp(); memory_tracker1_ = new CountingMemoryTracker; texture_manager1_.reset( @@ -2221,7 +2215,7 @@ class SharedTextureTest : public GpuServiceTest { texture_manager2_->Initialize(); } - virtual void TearDown() { + void TearDown() override { texture_manager2_->Destroy(false); texture_manager2_.reset(); texture_manager1_->Destroy(false); diff --git a/gpu/command_buffer/service/transfer_buffer_manager_unittest.cc b/gpu/command_buffer/service/transfer_buffer_manager_unittest.cc index 563b6cb..6f35601 100644 --- a/gpu/command_buffer/service/transfer_buffer_manager_unittest.cc +++ b/gpu/command_buffer/service/transfer_buffer_manager_unittest.cc @@ -16,7 +16,7 @@ const static size_t kBufferSize = 1024; class TransferBufferManagerTest : public testing::Test { protected: - virtual void SetUp() { + void SetUp() override { TransferBufferManager* manager = new TransferBufferManager(); transfer_buffer_manager_.reset(manager); ASSERT_TRUE(manager->Initialize()); diff --git a/gpu/command_buffer/service/vertex_array_manager_unittest.cc b/gpu/command_buffer/service/vertex_array_manager_unittest.cc index aa2df35..24592b6 100644 --- a/gpu/command_buffer/service/vertex_array_manager_unittest.cc +++ b/gpu/command_buffer/service/vertex_array_manager_unittest.cc @@ -25,16 +25,15 @@ class VertexArrayManagerTest : public GpuServiceTest { VertexArrayManagerTest() { } - virtual ~VertexArrayManagerTest() { - } + ~VertexArrayManagerTest() override {} protected: - virtual void SetUp() { + void SetUp() override { GpuServiceTest::SetUp(); manager_.reset(new VertexArrayManager()); } - virtual void TearDown() { + void TearDown() override { manager_.reset(); GpuServiceTest::TearDown(); } diff --git a/gpu/command_buffer/service/vertex_attrib_manager_unittest.cc b/gpu/command_buffer/service/vertex_attrib_manager_unittest.cc index e7fd690..b82858e 100644 --- a/gpu/command_buffer/service/vertex_attrib_manager_unittest.cc +++ b/gpu/command_buffer/service/vertex_attrib_manager_unittest.cc @@ -26,11 +26,10 @@ class VertexAttribManagerTest : public GpuServiceTest { VertexAttribManagerTest() { } - virtual ~VertexAttribManagerTest() { - } + ~VertexAttribManagerTest() override {} protected: - virtual void SetUp() { + void SetUp() override { GpuServiceTest::SetUp(); for (uint32 ii = 0; ii < kNumVertexAttribs; ++ii) { diff --git a/gpu/command_buffer/tests/compressed_texture_test.cc b/gpu/command_buffer/tests/compressed_texture_test.cc index 8c214b2..754e2d4 100644 --- a/gpu/command_buffer/tests/compressed_texture_test.cc +++ b/gpu/command_buffer/tests/compressed_texture_test.cc @@ -148,15 +148,13 @@ static void ToRGB888(uint16 rgb565, uint8 rgb888[]) { class CompressedTextureTest : public ::testing::TestWithParam<GLenum> { protected: - virtual void SetUp() { + void SetUp() override { GLManager::Options options; options.size = gfx::Size(kTextureWidth, kTextureHeight); gl_.Initialize(options); } - virtual void TearDown() { - gl_.Destroy(); - } + void TearDown() override { gl_.Destroy(); } GLuint LoadProgram() { const char* v_shader_src = SHADER( diff --git a/gpu/command_buffer/tests/gl_bind_uniform_location_unittest.cc b/gpu/command_buffer/tests/gl_bind_uniform_location_unittest.cc index c313273..81e2435 100644 --- a/gpu/command_buffer/tests/gl_bind_uniform_location_unittest.cc +++ b/gpu/command_buffer/tests/gl_bind_uniform_location_unittest.cc @@ -18,15 +18,13 @@ namespace gpu { class BindUniformLocationTest : public testing::Test { protected: static const GLsizei kResolution = 4; - virtual void SetUp() { + void SetUp() override { GLManager::Options options; options.size = gfx::Size(kResolution, kResolution); gl_.Initialize(options); } - virtual void TearDown() { - gl_.Destroy(); - } + void TearDown() override { gl_.Destroy(); } GLManager gl_; }; diff --git a/gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc b/gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc index fe61d51..9d36a26 100644 --- a/gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc +++ b/gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc @@ -15,13 +15,9 @@ namespace gpu { class GLChromiumFramebufferMultisampleTest : public testing::Test { protected: - virtual void SetUp() { - gl_.Initialize(GLManager::Options()); - } + void SetUp() override { gl_.Initialize(GLManager::Options()); } - virtual void TearDown() { - gl_.Destroy(); - } + void TearDown() override { gl_.Destroy(); } GLManager gl_; }; diff --git a/gpu/command_buffer/tests/gl_chromium_path_rendering_unittest.cc b/gpu/command_buffer/tests/gl_chromium_path_rendering_unittest.cc index 1d90053..0d17b7c 100644 --- a/gpu/command_buffer/tests/gl_chromium_path_rendering_unittest.cc +++ b/gpu/command_buffer/tests/gl_chromium_path_rendering_unittest.cc @@ -19,13 +19,13 @@ class CHROMIUMPathRenderingTest : public testing::Test { static const GLsizei kResolution = 100; protected: - virtual void SetUp() { + void SetUp() override { GLManager::Options options; options.size = gfx::Size(kResolution, kResolution); gl_.Initialize(options); } - virtual void TearDown() { gl_.Destroy(); } + void TearDown() override { gl_.Destroy(); } void ExpectEqualMatrix(const GLfloat* expected, const GLfloat* actual) { for (size_t i = 0; i < 16; ++i) { diff --git a/gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc b/gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc index d03b121..2c44e1a 100644 --- a/gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc +++ b/gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc @@ -20,7 +20,7 @@ namespace gpu { // A collection of tests that exercise the GL_CHROMIUM_copy_texture extension. class GLCopyTextureCHROMIUMTest : public testing::Test { protected: - virtual void SetUp() { + void SetUp() override { gl_.Initialize(GLManager::Options()); glGenTextures(2, textures_); @@ -39,7 +39,7 @@ class GLCopyTextureCHROMIUMTest : public testing::Test { textures_[1], 0); } - virtual void TearDown() { + void TearDown() override { glDeleteTextures(2, textures_); glDeleteFramebuffers(1, &framebuffer_id_); gl_.Destroy(); diff --git a/gpu/command_buffer/tests/gl_depth_texture_unittest.cc b/gpu/command_buffer/tests/gl_depth_texture_unittest.cc index 83bb84c..5bbbb06 100644 --- a/gpu/command_buffer/tests/gl_depth_texture_unittest.cc +++ b/gpu/command_buffer/tests/gl_depth_texture_unittest.cc @@ -17,15 +17,13 @@ namespace gpu { class DepthTextureTest : public testing::Test { protected: static const GLsizei kResolution = 64; - virtual void SetUp() { + void SetUp() override { GLManager::Options options; options.size = gfx::Size(kResolution, kResolution); gl_.Initialize(options); } - virtual void TearDown() { - gl_.Destroy(); - } + void TearDown() override { gl_.Destroy(); } GLuint SetupUnitQuad(GLint position_location); diff --git a/gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc b/gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc index 745ceb9..8430dfb 100644 --- a/gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc +++ b/gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc @@ -37,7 +37,7 @@ static const int kImageBytesPerPixel = 4; class GpuMemoryBufferTest : public testing::Test { protected: - virtual void SetUp() { + void SetUp() override { gl_.Initialize(GLManager::Options()); gl_.MakeCurrent(); @@ -58,7 +58,7 @@ class GpuMemoryBufferTest : public testing::Test { 0); } - virtual void TearDown() { + void TearDown() override { glDeleteTextures(2, texture_ids_); glDeleteFramebuffers(1, &framebuffer_id_); diff --git a/gpu/command_buffer/tests/gl_lose_context_chromium_unittest.cc b/gpu/command_buffer/tests/gl_lose_context_chromium_unittest.cc index 547c1ed..94381ac 100644 --- a/gpu/command_buffer/tests/gl_lose_context_chromium_unittest.cc +++ b/gpu/command_buffer/tests/gl_lose_context_chromium_unittest.cc @@ -17,7 +17,7 @@ namespace gpu { class GLLoseContextTest : public testing::Test { protected: - virtual void SetUp() { + void SetUp() override { GLManager::Options options; gl2_.Initialize(options); options.context_lost_allowed = true; @@ -26,7 +26,7 @@ class GLLoseContextTest : public testing::Test { gl1b_.Initialize(options); } - virtual void TearDown() { + void TearDown() override { gl1a_.Destroy(); gl1b_.Destroy(); gl2_.Destroy(); diff --git a/gpu/command_buffer/tests/gl_pointcoord_unittest.cc b/gpu/command_buffer/tests/gl_pointcoord_unittest.cc index fe71eed..d9501b0 100644 --- a/gpu/command_buffer/tests/gl_pointcoord_unittest.cc +++ b/gpu/command_buffer/tests/gl_pointcoord_unittest.cc @@ -19,15 +19,13 @@ class PointCoordTest : public testing::Test { static const GLsizei kResolution = 256; protected: - virtual void SetUp() { + void SetUp() override { GLManager::Options options; options.size = gfx::Size(kResolution, kResolution); gl_.Initialize(options); } - virtual void TearDown() { - gl_.Destroy(); - } + void TearDown() override { gl_.Destroy(); } GLuint SetupQuad(GLint position_location, GLfloat pixel_offset); diff --git a/gpu/command_buffer/tests/gl_program_unittest.cc b/gpu/command_buffer/tests/gl_program_unittest.cc index b99aa58..aec95b2 100644 --- a/gpu/command_buffer/tests/gl_program_unittest.cc +++ b/gpu/command_buffer/tests/gl_program_unittest.cc @@ -16,13 +16,9 @@ namespace gpu { class GLProgramTest : public testing::Test { protected: - virtual void SetUp() { - gl_.Initialize(GLManager::Options()); - } + void SetUp() override { gl_.Initialize(GLManager::Options()); } - virtual void TearDown() { - gl_.Destroy(); - } + void TearDown() override { gl_.Destroy(); } GLManager gl_; }; diff --git a/gpu/command_buffer/tests/gl_query_unittest.cc b/gpu/command_buffer/tests/gl_query_unittest.cc index 87235e5..0104430 100644 --- a/gpu/command_buffer/tests/gl_query_unittest.cc +++ b/gpu/command_buffer/tests/gl_query_unittest.cc @@ -16,13 +16,9 @@ namespace gpu { class QueryTest : public testing::Test { protected: - virtual void SetUp() { - gl_.Initialize(GLManager::Options()); - } + void SetUp() override { gl_.Initialize(GLManager::Options()); } - virtual void TearDown() { - gl_.Destroy(); - } + void TearDown() override { gl_.Destroy(); } GLManager gl_; }; diff --git a/gpu/command_buffer/tests/gl_readback_unittest.cc b/gpu/command_buffer/tests/gl_readback_unittest.cc index e67cbdc..cbda25c 100644 --- a/gpu/command_buffer/tests/gl_readback_unittest.cc +++ b/gpu/command_buffer/tests/gl_readback_unittest.cc @@ -21,13 +21,9 @@ namespace gpu { class GLReadbackTest : public testing::Test { protected: - virtual void SetUp() { - gl_.Initialize(GLManager::Options()); - } + void SetUp() override { gl_.Initialize(GLManager::Options()); } - virtual void TearDown() { - gl_.Destroy(); - } + void TearDown() override { gl_.Destroy(); } static void WaitForQueryCallback(int q, base::Closure cb) { unsigned int done = 0; diff --git a/gpu/command_buffer/tests/gl_shared_resources_unittest.cc b/gpu/command_buffer/tests/gl_shared_resources_unittest.cc index 136b57a..0f7ffe8 100644 --- a/gpu/command_buffer/tests/gl_shared_resources_unittest.cc +++ b/gpu/command_buffer/tests/gl_shared_resources_unittest.cc @@ -15,7 +15,7 @@ namespace gpu { class GLSharedResources : public testing::Test { protected: - virtual void SetUp() { + void SetUp() override { GLManager::Options options; options.bind_generates_resource = true; gl1_.Initialize(options); @@ -23,7 +23,7 @@ class GLSharedResources : public testing::Test { gl2_.Initialize(options); } - virtual void TearDown() { + void TearDown() override { gl1_.Destroy(); gl2_.Destroy(); } diff --git a/gpu/command_buffer/tests/gl_stream_draw_unittest.cc b/gpu/command_buffer/tests/gl_stream_draw_unittest.cc index 7ccd48d..90968c8 100644 --- a/gpu/command_buffer/tests/gl_stream_draw_unittest.cc +++ b/gpu/command_buffer/tests/gl_stream_draw_unittest.cc @@ -19,15 +19,13 @@ class GLStreamDrawTest : public testing::Test { protected: static const int kSize = 4; - virtual void SetUp() { + void SetUp() override { GLManager::Options options; options.size = gfx::Size(kSize, kSize); gl_.Initialize(options); } - virtual void TearDown() { - gl_.Destroy(); - } + void TearDown() override { gl_.Destroy(); } GLManager gl_; }; diff --git a/gpu/command_buffer/tests/gl_texture_mailbox_unittest.cc b/gpu/command_buffer/tests/gl_texture_mailbox_unittest.cc index 1ce8303..3ceb5ff 100644 --- a/gpu/command_buffer/tests/gl_texture_mailbox_unittest.cc +++ b/gpu/command_buffer/tests/gl_texture_mailbox_unittest.cc @@ -54,14 +54,14 @@ uint32 ReadTexel(GLuint id, GLint x, GLint y) { class GLTextureMailboxTest : public testing::Test { protected: - virtual void SetUp() { + void SetUp() override { gl1_.Initialize(GLManager::Options()); GLManager::Options options; options.share_mailbox_manager = &gl1_; gl2_.Initialize(options); } - virtual void TearDown() { + void TearDown() override { gl1_.Destroy(); gl2_.Destroy(); } diff --git a/gpu/command_buffer/tests/gl_texture_storage_unittest.cc b/gpu/command_buffer/tests/gl_texture_storage_unittest.cc index b28baf0..1f14e28 100644 --- a/gpu/command_buffer/tests/gl_texture_storage_unittest.cc +++ b/gpu/command_buffer/tests/gl_texture_storage_unittest.cc @@ -15,7 +15,7 @@ namespace gpu { class TextureStorageTest : public testing::Test { protected: static const GLsizei kResolution = 64; - virtual void SetUp() { + void SetUp() override { GLManager::Options options; options.size = gfx::Size(kResolution, kResolution); gl_.Initialize(options); @@ -37,9 +37,7 @@ class TextureStorageTest : public testing::Test { extensions), "GL_EXT_texture_storage"); } - virtual void TearDown() { - gl_.Destroy(); - } + void TearDown() override { gl_.Destroy(); } GLManager gl_; GLuint tex_; diff --git a/gpu/command_buffer/tests/gl_unittest.cc b/gpu/command_buffer/tests/gl_unittest.cc index f5c380f..9915190 100644 --- a/gpu/command_buffer/tests/gl_unittest.cc +++ b/gpu/command_buffer/tests/gl_unittest.cc @@ -14,13 +14,9 @@ namespace gpu { class GLTest : public testing::Test { protected: - virtual void SetUp() { - gl_.Initialize(GLManager::Options()); - } + void SetUp() override { gl_.Initialize(GLManager::Options()); } - virtual void TearDown() { - gl_.Destroy(); - } + void TearDown() override { gl_.Destroy(); } GLManager gl_; }; diff --git a/gpu/command_buffer/tests/gl_virtual_contexts_unittest.cc b/gpu/command_buffer/tests/gl_virtual_contexts_unittest.cc index 17cfa9f..9373c38 100644 --- a/gpu/command_buffer/tests/gl_virtual_contexts_unittest.cc +++ b/gpu/command_buffer/tests/gl_virtual_contexts_unittest.cc @@ -26,7 +26,7 @@ class GLVirtualContextsTest : public testing::Test { static const uint8 kExpectedRed[4]; static const uint8 kExpectedGreen[4]; - virtual void SetUp() { + void SetUp() override { GLManager::Options options; options.size = gfx::Size(kSize0, kSize0); gl_real_.Initialize(options); @@ -38,7 +38,7 @@ class GLVirtualContextsTest : public testing::Test { gl2_.Initialize(options); } - virtual void TearDown() { + void TearDown() override { gl1_.Destroy(); gl2_.Destroy(); gl_real_shared_.Destroy(); diff --git a/gpu/command_buffer/tests/occlusion_query_unittest.cc b/gpu/command_buffer/tests/occlusion_query_unittest.cc index 7cbb1a8..2f749c7 100644 --- a/gpu/command_buffer/tests/occlusion_query_unittest.cc +++ b/gpu/command_buffer/tests/occlusion_query_unittest.cc @@ -14,15 +14,13 @@ namespace gpu { class OcclusionQueryTest : public testing::Test { protected: - virtual void SetUp() { + void SetUp() override { GLManager::Options options; options.size = gfx::Size(512, 512); gl_.Initialize(options); } - virtual void TearDown() { - gl_.Destroy(); - } + void TearDown() override { gl_.Destroy(); } void DrawRect(float x, float z, float scale, float* color); |