diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-25 11:39:07 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-25 15:20:42 +0000 |
| commit | 6c91641271e536ffaa88a1dff5127e42ee99a91e (patch) | |
| tree | 703d9dd49602377ddc90cbf886aad37913f2496b /chromium/media/video/picture.cc | |
| parent | b145b7fafd36f0c260d6a768c81fc14e32578099 (diff) | |
| download | qtwebengine-chromium-6c91641271e536ffaa88a1dff5127e42ee99a91e.tar.gz | |
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources.
Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/media/video/picture.cc')
| -rw-r--r-- | chromium/media/video/picture.cc | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/chromium/media/video/picture.cc b/chromium/media/video/picture.cc index 62057950ee3..315ad658289 100644 --- a/chromium/media/video/picture.cc +++ b/chromium/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 |