| Index: media/base/data_buffer.h
|
| diff --git a/media/base/data_buffer.h b/media/base/data_buffer.h
|
| index 651088fca1151642ab9a19a4eb1bfc0a93837fac..15ef32ddf35d7e5572d9a838c015d85073aad905 100644
|
| --- a/media/base/data_buffer.h
|
| +++ b/media/base/data_buffer.h
|
| @@ -18,18 +18,18 @@ namespace media {
|
| class MEDIA_EXPORT DataBuffer : public Buffer {
|
| public:
|
| // Assumes valid data of size |buffer_size|.
|
| - DataBuffer(scoped_array<uint8> buffer, size_t buffer_size);
|
| + DataBuffer(scoped_array<uint8> buffer, int buffer_size);
|
|
|
| // Allocates buffer of size |buffer_size|. If |buffer_size| is 0, |data_| is
|
| // set to a NULL ptr.
|
| - explicit DataBuffer(size_t buffer_size);
|
| + explicit DataBuffer(int buffer_size);
|
|
|
| // Create a DataBuffer whose |data_| is copied from |data|.
|
| - static scoped_refptr<DataBuffer> CopyFrom(const uint8* data, size_t size);
|
| + static scoped_refptr<DataBuffer> CopyFrom(const uint8* data, int size);
|
|
|
| // Buffer implementation.
|
| virtual const uint8* GetData() const OVERRIDE;
|
| - virtual size_t GetDataSize() const OVERRIDE;
|
| + virtual int GetDataSize() const OVERRIDE;
|
| virtual const DecryptConfig* GetDecryptConfig() const OVERRIDE;
|
|
|
| // Returns a read-write pointer to the buffer data.
|
| @@ -37,10 +37,10 @@ class MEDIA_EXPORT DataBuffer : public Buffer {
|
|
|
| // Updates the size of valid data in bytes, which must be less than or equal
|
| // to GetBufferSize().
|
| - virtual void SetDataSize(size_t data_size);
|
| + virtual void SetDataSize(int data_size);
|
|
|
| // Returns the size of the underlying buffer.
|
| - virtual size_t GetBufferSize() const;
|
| + virtual int GetBufferSize() const;
|
|
|
| virtual void SetDecryptConfig(scoped_ptr<DecryptConfig> decrypt_config);
|
|
|
| @@ -49,8 +49,8 @@ class MEDIA_EXPORT DataBuffer : public Buffer {
|
|
|
| private:
|
| scoped_array<uint8> data_;
|
| - size_t buffer_size_;
|
| - size_t data_size_;
|
| + int buffer_size_;
|
| + int data_size_;
|
| scoped_ptr<DecryptConfig> decrypt_config_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(DataBuffer);
|
|
|