| Index: mojo/public/cpp/bindings/lib/fixed_buffer.h
|
| diff --git a/mojo/public/cpp/bindings/lib/fixed_buffer.h b/mojo/public/cpp/bindings/lib/fixed_buffer.h
|
| index 9a5704b4bfa62b2ae549c2eaaa2a6a4794b1554e..7345d93970287d8c6e164478351f055744cf1fcf 100644
|
| --- a/mojo/public/cpp/bindings/lib/fixed_buffer.h
|
| +++ b/mojo/public/cpp/bindings/lib/fixed_buffer.h
|
| @@ -13,56 +13,12 @@
|
| namespace mojo {
|
| namespace internal {
|
|
|
| -// FixedBuffer provides a simple way to allocate objects within a fixed chunk
|
| -// of memory. Objects are allocated by calling the |Allocate| method, which
|
| -// extends the buffer accordingly. Objects allocated in this way are not freed
|
| -// explicitly. Instead, they remain valid so long as the FixedBuffer remains
|
| -// valid. The Leak method may be used to steal the underlying memory from the
|
| -// FixedBuffer.
|
| -//
|
| -// Typical usage:
|
| -//
|
| -// {
|
| -// FixedBuffer buf(8 + 8);
|
| -//
|
| -// int* a = static_cast<int*>(buf->Allocate(sizeof(int)));
|
| -// *a = 2;
|
| -//
|
| -// double* b = static_cast<double*>(buf->Allocate(sizeof(double)));
|
| -// *b = 3.14f;
|
| -//
|
| -// void* data = buf.Leak();
|
| -// Process(data);
|
| -//
|
| -// free(data);
|
| -// }
|
| -
|
| -class FixedBuffer : public Buffer {
|
| - public:
|
| - FixedBuffer();
|
| -
|
| - // |size| should be aligned using internal::Align.
|
| - void Initialize(void* memory, size_t size);
|
| -
|
| - size_t size() const { return size_; }
|
| -
|
| - // Grows the buffer by |num_bytes| and returns a pointer to the start of the
|
| - // addition. The resulting address is 8-byte aligned, and the content of the
|
| - // memory is zero-filled.
|
| - void* Allocate(size_t num_bytes) override;
|
| -
|
| - protected:
|
| - char* ptr_;
|
| - size_t cursor_;
|
| - size_t size_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(FixedBuffer);
|
| -};
|
| -
|
| -class FixedBufferForTesting : public FixedBuffer {
|
| +// FixedBufferForTesting owns its buffer. The Leak method may be used to steal
|
| +// the underlying memory.
|
| +class FixedBufferForTesting : public Buffer {
|
| public:
|
| explicit FixedBufferForTesting(size_t size);
|
| - ~FixedBufferForTesting() override;
|
| + ~FixedBufferForTesting();
|
|
|
| // Returns the internal memory owned by the Buffer to the caller. The Buffer
|
| // relinquishes its pointer, effectively resetting the state of the Buffer
|
|
|