| Index: gpu/command_buffer/service/async_pixel_transfer_manager_idle.h
|
| diff --git a/gpu/command_buffer/service/async_pixel_transfer_manager_idle.h b/gpu/command_buffer/service/async_pixel_transfer_manager_idle.h
|
| index af3262f2889b76bd26853ca4745cb49f05028b6d..0ec950cec672852f0fe42836e2c76055693bc251 100644
|
| --- a/gpu/command_buffer/service/async_pixel_transfer_manager_idle.h
|
| +++ b/gpu/command_buffer/service/async_pixel_transfer_manager_idle.h
|
| @@ -17,15 +17,15 @@ class AsyncPixelTransferManagerIdle : public AsyncPixelTransferManager {
|
| virtual ~AsyncPixelTransferManagerIdle();
|
|
|
| // AsyncPixelTransferManager implementation:
|
| - virtual void BindCompletedAsyncTransfers() OVERRIDE;
|
| + virtual void BindCompletedAsyncTransfers() override;
|
| virtual 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;
|
| + AsyncPixelTransferCompletionObserver* observer) override;
|
| + virtual uint32 GetTextureUploadCount() override;
|
| + virtual base::TimeDelta GetTotalTextureUploadTime() override;
|
| + virtual void ProcessMorePendingTransfers() override;
|
| + virtual bool NeedsProcessMorePendingTransfers() override;
|
| + virtual void WaitAllAsyncTexImage2D() override;
|
|
|
| struct Task {
|
| Task(uint64 transfer_id,
|
| @@ -56,7 +56,7 @@ class AsyncPixelTransferManagerIdle : public AsyncPixelTransferManager {
|
| // AsyncPixelTransferManager implementation:
|
| virtual AsyncPixelTransferDelegate* CreatePixelTransferDelegateImpl(
|
| gles2::TextureRef* ref,
|
| - const AsyncTexImage2DParams& define_params) OVERRIDE;
|
| + const AsyncTexImage2DParams& define_params) override;
|
|
|
| SharedState shared_state_;
|
|
|
|
|