| Index: media/video/picture.cc
|
| diff --git a/media/video/picture.cc b/media/video/picture.cc
|
| index 60fd3f56d636c956316bdf5e0578935967126ba4..54e4a234073e534c211c2102f6b1638062ae84b2 100644
|
| --- a/media/video/picture.cc
|
| +++ b/media/video/picture.cc
|
| @@ -6,30 +6,15 @@
|
|
|
| namespace media {
|
|
|
| -BaseBuffer::~BaseBuffer() {}
|
| -
|
| -// Implementations for the other constructors are found in
|
| -// webkit/plugins/ppapi/ppb_video_decoder_impl.cc.
|
| -// They are not included in this file because it would require
|
| -// media/ to depend on files in ppapi/.
|
| -BaseBuffer::BaseBuffer(int32 id, gfx::Size size) : id_(id), size_(size) {
|
| -}
|
| -
|
| -GLESBuffer::GLESBuffer(int32 id, gfx::Size size, uint32 texture_id)
|
| - : BaseBuffer(id, size),
|
| +PictureBuffer::PictureBuffer(int32 id, gfx::Size size, uint32 texture_id)
|
| + : id_(id),
|
| + size_(size),
|
| texture_id_(texture_id) {
|
| }
|
|
|
| -SysmemBuffer::SysmemBuffer(int32 id, gfx::Size size, void* data)
|
| - : BaseBuffer(id, size), data_(data) {
|
| -}
|
| -
|
| -Picture::Picture(int32 picture_buffer_id, int32 bitstream_buffer_id,
|
| - gfx::Size visible_size, gfx::Size decoded_size)
|
| +Picture::Picture(int32 picture_buffer_id, int32 bitstream_buffer_id)
|
| : picture_buffer_id_(picture_buffer_id),
|
| - bitstream_buffer_id_(bitstream_buffer_id),
|
| - visible_size_(visible_size),
|
| - decoded_size_(decoded_size) {
|
| + bitstream_buffer_id_(bitstream_buffer_id) {
|
| }
|
|
|
| } // namespace media
|
|
|