| Index: gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc
|
| 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 1e4066f33145aa1c5cb0cd765fd6642178e32155..34e3a3702bf18d4f1839099ad2c3188a8537183d 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.
|
|
|