| Index: content/renderer/pepper/pepper_video_decoder_host.cc
|
| diff --git a/content/renderer/pepper/pepper_video_decoder_host.cc b/content/renderer/pepper/pepper_video_decoder_host.cc
|
| index 2b5f58451c2659fdbd014d277cdf1fd87676f9ae..50403a6991fc2f6645ae5636c87e33972f2e4f33 100644
|
| --- a/content/renderer/pepper/pepper_video_decoder_host.cc
|
| +++ b/content/renderer/pepper/pepper_video_decoder_host.cc
|
| @@ -4,8 +4,11 @@
|
|
|
| #include "content/renderer/pepper/pepper_video_decoder_host.h"
|
|
|
| +#include <stddef.h>
|
| +
|
| #include "base/bind.h"
|
| #include "base/memory/shared_memory.h"
|
| +#include "build/build_config.h"
|
| #include "content/common/gpu/client/command_buffer_proxy_impl.h"
|
| #include "content/common/pepper_file_util.h"
|
| #include "content/public/common/content_client.h"
|
| @@ -342,9 +345,9 @@ int32_t PepperVideoDecoderHost::OnHostMsgReset(
|
| }
|
|
|
| void PepperVideoDecoderHost::ProvidePictureBuffers(
|
| - uint32 requested_num_of_buffers,
|
| + uint32_t requested_num_of_buffers,
|
| const gfx::Size& dimensions,
|
| - uint32 texture_target) {
|
| + uint32_t texture_target) {
|
| RequestTextures(std::max(min_picture_count_, requested_num_of_buffers),
|
| dimensions,
|
| texture_target,
|
| @@ -367,7 +370,7 @@ void PepperVideoDecoderHost::PictureReady(const media::Picture& picture) {
|
| picture.picture_buffer_id(), visible_rect));
|
| }
|
|
|
| -void PepperVideoDecoderHost::DismissPictureBuffer(int32 picture_buffer_id) {
|
| +void PepperVideoDecoderHost::DismissPictureBuffer(int32_t picture_buffer_id) {
|
| PictureBufferMap::iterator it = picture_buffer_map_.find(picture_buffer_id);
|
| DCHECK(it != picture_buffer_map_.end());
|
|
|
| @@ -386,7 +389,7 @@ void PepperVideoDecoderHost::DismissPictureBuffer(int32 picture_buffer_id) {
|
| }
|
|
|
| void PepperVideoDecoderHost::NotifyEndOfBitstreamBuffer(
|
| - int32 bitstream_buffer_id) {
|
| + int32_t bitstream_buffer_id) {
|
| PendingDecodeList::iterator it = GetPendingDecodeById(bitstream_buffer_id);
|
| if (it == pending_decodes_.end()) {
|
| NOTREACHED();
|
| @@ -448,9 +451,9 @@ const uint8_t* PepperVideoDecoderHost::DecodeIdToAddress(uint32_t decode_id) {
|
| }
|
|
|
| void PepperVideoDecoderHost::RequestTextures(
|
| - uint32 requested_num_of_buffers,
|
| + uint32_t requested_num_of_buffers,
|
| const gfx::Size& dimensions,
|
| - uint32 texture_target,
|
| + uint32_t texture_target,
|
| const std::vector<gpu::Mailbox>& mailboxes) {
|
| host()->SendUnsolicitedReply(
|
| pp_resource(),
|
|
|