| Index: media/video/picture.cc
|
| diff --git a/media/video/picture.cc b/media/video/picture.cc
|
| index 62057950ee3684bb980648dceac2c5fc13f46484..315ad658289916ab32c77b03257306042a188be6 100644
|
| --- a/media/video/picture.cc
|
| +++ b/media/video/picture.cc
|
| @@ -6,39 +6,35 @@
|
|
|
| namespace media {
|
|
|
| -PictureBuffer::PictureBuffer(int32 id, gfx::Size size, uint32 texture_id)
|
| - : id_(id), size_(size), texture_id_(texture_id), internal_texture_id_(0) {
|
| -}
|
| +PictureBuffer::PictureBuffer(int32_t id, gfx::Size size, uint32_t texture_id)
|
| + : id_(id), size_(size), texture_id_(texture_id), internal_texture_id_(0) {}
|
|
|
| -PictureBuffer::PictureBuffer(int32 id,
|
| +PictureBuffer::PictureBuffer(int32_t id,
|
| gfx::Size size,
|
| - uint32 texture_id,
|
| - uint32 internal_texture_id)
|
| + uint32_t texture_id,
|
| + uint32_t internal_texture_id)
|
| : id_(id),
|
| size_(size),
|
| texture_id_(texture_id),
|
| - internal_texture_id_(internal_texture_id) {
|
| -}
|
| + internal_texture_id_(internal_texture_id) {}
|
|
|
| -PictureBuffer::PictureBuffer(int32 id,
|
| +PictureBuffer::PictureBuffer(int32_t id,
|
| gfx::Size size,
|
| - uint32 texture_id,
|
| + uint32_t texture_id,
|
| const gpu::Mailbox& texture_mailbox)
|
| : id_(id),
|
| size_(size),
|
| texture_id_(texture_id),
|
| internal_texture_id_(0),
|
| - texture_mailbox_(texture_mailbox) {
|
| -}
|
| + texture_mailbox_(texture_mailbox) {}
|
|
|
| -Picture::Picture(int32 picture_buffer_id,
|
| - int32 bitstream_buffer_id,
|
| +Picture::Picture(int32_t picture_buffer_id,
|
| + int32_t bitstream_buffer_id,
|
| const gfx::Rect& visible_rect,
|
| bool allow_overlay)
|
| : picture_buffer_id_(picture_buffer_id),
|
| bitstream_buffer_id_(bitstream_buffer_id),
|
| visible_rect_(visible_rect),
|
| - allow_overlay_(allow_overlay) {
|
| -}
|
| + allow_overlay_(allow_overlay) {}
|
|
|
| } // namespace media
|
|
|