| Index: gpu/command_buffer/client/transfer_buffer.h
|
| diff --git a/gpu/command_buffer/client/transfer_buffer.h b/gpu/command_buffer/client/transfer_buffer.h
|
| index c27dd21c1dbd1ff98aecb014fbe1399a1f2dc44c..39e62a6c67d9431574c7ac8ce006a76785861895 100644
|
| --- a/gpu/command_buffer/client/transfer_buffer.h
|
| +++ b/gpu/command_buffer/client/transfer_buffer.h
|
| @@ -54,26 +54,24 @@ class GPU_EXPORT TransferBufferInterface {
|
| class GPU_EXPORT TransferBuffer : public TransferBufferInterface {
|
| public:
|
| TransferBuffer(CommandBufferHelper* helper);
|
| - virtual ~TransferBuffer();
|
| + ~TransferBuffer() override;
|
|
|
| // Overridden from TransferBufferInterface.
|
| - virtual bool Initialize(
|
| - unsigned int default_buffer_size,
|
| - unsigned int result_size,
|
| - unsigned int min_buffer_size,
|
| - unsigned int max_buffer_size,
|
| - unsigned int alignment,
|
| - unsigned int size_to_flush) override;
|
| - virtual int GetShmId() override;
|
| - virtual void* GetResultBuffer() override;
|
| - virtual int GetResultOffset() override;
|
| - virtual void Free() override;
|
| - virtual bool HaveBuffer() const override;
|
| - virtual void* AllocUpTo(
|
| - unsigned int size, unsigned int* size_allocated) override;
|
| - virtual void* Alloc(unsigned int size) override;
|
| - virtual RingBuffer::Offset GetOffset(void* pointer) const override;
|
| - virtual void FreePendingToken(void* p, unsigned int token) override;
|
| + bool Initialize(unsigned int default_buffer_size,
|
| + unsigned int result_size,
|
| + unsigned int min_buffer_size,
|
| + unsigned int max_buffer_size,
|
| + unsigned int alignment,
|
| + unsigned int size_to_flush) override;
|
| + int GetShmId() override;
|
| + void* GetResultBuffer() override;
|
| + int GetResultOffset() override;
|
| + void Free() override;
|
| + bool HaveBuffer() const override;
|
| + void* AllocUpTo(unsigned int size, unsigned int* size_allocated) override;
|
| + void* Alloc(unsigned int size) override;
|
| + RingBuffer::Offset GetOffset(void* pointer) const override;
|
| + void FreePendingToken(void* p, unsigned int token) override;
|
|
|
| // These are for testing.
|
| unsigned int GetCurrentMaxAllocationWithoutRealloc() const;
|
|
|