| Index: gpu/command_buffer/service/async_pixel_transfer_manager_sync.h
|
| diff --git a/gpu/command_buffer/service/async_pixel_transfer_manager_sync.h b/gpu/command_buffer/service/async_pixel_transfer_manager_sync.h
|
| index a08e9155633967933a87353dca4965066ff4d047..b965d6f444af1443531b840c848ab23abe169f37 100644
|
| --- a/gpu/command_buffer/service/async_pixel_transfer_manager_sync.h
|
| +++ b/gpu/command_buffer/service/async_pixel_transfer_manager_sync.h
|
| @@ -12,18 +12,18 @@ namespace gpu {
|
| class AsyncPixelTransferManagerSync : public AsyncPixelTransferManager {
|
| public:
|
| AsyncPixelTransferManagerSync();
|
| - virtual ~AsyncPixelTransferManagerSync();
|
| + ~AsyncPixelTransferManagerSync() 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 {
|
| @@ -36,7 +36,7 @@ class AsyncPixelTransferManagerSync : public AsyncPixelTransferManager {
|
|
|
| private:
|
| // AsyncPixelTransferManager implementation:
|
| - virtual AsyncPixelTransferDelegate* CreatePixelTransferDelegateImpl(
|
| + AsyncPixelTransferDelegate* CreatePixelTransferDelegateImpl(
|
| gles2::TextureRef* ref,
|
| const AsyncTexImage2DParams& define_params) override;
|
|
|
|
|