diff options
| -rw-r--r-- | ppapi/api/dev/pp_video_dev.idl | 2 | ||||
| -rw-r--r-- | ppapi/c/dev/pp_video_dev.h | 4 | ||||
| -rw-r--r-- | ppapi/proxy/ppapi_messages.h | 4 | ||||
| -rw-r--r-- | ppapi/proxy/ppb_graphics_3d_proxy.cc | 2 | ||||
| -rw-r--r-- | ppapi/proxy/ppb_graphics_3d_proxy.h | 2 | ||||
| -rw-r--r-- | ppapi/proxy/ppb_video_decoder_proxy.cc | 2 | ||||
| -rw-r--r-- | ppapi/proxy/ppb_video_decoder_proxy.h | 2 | ||||
| -rw-r--r-- | webkit/plugins/ppapi/ppb_video_decoder_impl.cc | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/ppapi/api/dev/pp_video_dev.idl b/ppapi/api/dev/pp_video_dev.idl index afeb4fb..5123232 100644 --- a/ppapi/api/dev/pp_video_dev.idl +++ b/ppapi/api/dev/pp_video_dev.idl @@ -53,7 +53,7 @@ struct PP_VideoBitstreamBuffer_Dev { /** * Size of the bitstream contained in buffer (in bytes). */ - int32_t size; + uint32_t size; }; /** diff --git a/ppapi/c/dev/pp_video_dev.h b/ppapi/c/dev/pp_video_dev.h index 65c2fab..340b14f 100644 --- a/ppapi/c/dev/pp_video_dev.h +++ b/ppapi/c/dev/pp_video_dev.h @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -/* From dev/pp_video_dev.idl modified Fri Jul 20 12:22:28 2012. */ +/* From dev/pp_video_dev.idl modified Fri Dec 7 15:33:11 2012. */ #ifndef PPAPI_C_DEV_PP_VIDEO_DEV_H_ #define PPAPI_C_DEV_PP_VIDEO_DEV_H_ @@ -72,7 +72,7 @@ struct PP_VideoBitstreamBuffer_Dev { /** * Size of the bitstream contained in buffer (in bytes). */ - int32_t size; + uint32_t size; }; PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_VideoBitstreamBuffer_Dev, 12); diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h index b964e1f..62e2116 100644 --- a/ppapi/proxy/ppapi_messages.h +++ b/ppapi/proxy/ppapi_messages.h @@ -913,7 +913,7 @@ IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBGraphics3D_AsyncFlush, int32 /* put_offset */) IPC_SYNC_MESSAGE_ROUTED2_1(PpapiHostMsg_PPBGraphics3D_CreateTransferBuffer, ppapi::HostResource /* context */, - int32 /* size */, + uint32 /* size */, int32 /* id */) IPC_SYNC_MESSAGE_ROUTED2_0(PpapiHostMsg_PPBGraphics3D_DestroyTransferBuffer, ppapi::HostResource /* context */, @@ -1242,7 +1242,7 @@ IPC_MESSAGE_ROUTED4(PpapiHostMsg_PPBVideoDecoder_Decode, ppapi::HostResource /* video_decoder */, ppapi::HostResource /* bitstream buffer */, int32 /* bitstream buffer id */, - int32 /* size of buffer */) + uint32 /* size of buffer */) IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBVideoDecoder_AssignPictureBuffers, ppapi::HostResource /* video_decoder */, std::vector<PP_PictureBuffer_Dev> /* picture buffers */) diff --git a/ppapi/proxy/ppb_graphics_3d_proxy.cc b/ppapi/proxy/ppb_graphics_3d_proxy.cc index cb2604a..cef181a 100644 --- a/ppapi/proxy/ppb_graphics_3d_proxy.cc +++ b/ppapi/proxy/ppb_graphics_3d_proxy.cc @@ -449,7 +449,7 @@ void PPB_Graphics3D_Proxy::OnMsgAsyncFlush(const HostResource& context, void PPB_Graphics3D_Proxy::OnMsgCreateTransferBuffer( const HostResource& context, - int32 size, + uint32 size, int32* id) { EnterHostFromHostResource<PPB_Graphics3D_API> enter(context); if (enter.succeeded()) diff --git a/ppapi/proxy/ppb_graphics_3d_proxy.h b/ppapi/proxy/ppb_graphics_3d_proxy.h index de6afd0..17529a1 100644 --- a/ppapi/proxy/ppb_graphics_3d_proxy.h +++ b/ppapi/proxy/ppb_graphics_3d_proxy.h @@ -96,7 +96,7 @@ class PPB_Graphics3D_Proxy : public InterfaceProxy { void OnMsgAsyncFlush(const HostResource& context, int32 put_offset); void OnMsgCreateTransferBuffer(const HostResource& context, - int32 size, + uint32 size, int32* id); void OnMsgDestroyTransferBuffer(const HostResource& context, int32 id); diff --git a/ppapi/proxy/ppb_video_decoder_proxy.cc b/ppapi/proxy/ppb_video_decoder_proxy.cc index 4689be6..496646e 100644 --- a/ppapi/proxy/ppb_video_decoder_proxy.cc +++ b/ppapi/proxy/ppb_video_decoder_proxy.cc @@ -226,7 +226,7 @@ void PPB_VideoDecoder_Proxy::OnMsgCreate( void PPB_VideoDecoder_Proxy::OnMsgDecode( const HostResource& decoder, - const HostResource& buffer, int32 id, int32 size) { + const HostResource& buffer, int32 id, uint32 size) { EnterHostFromHostResourceForceCallback<PPB_VideoDecoder_API> enter( decoder, callback_factory_, &PPB_VideoDecoder_Proxy::SendMsgEndOfBitstreamACKToPlugin, decoder, id); diff --git a/ppapi/proxy/ppb_video_decoder_proxy.h b/ppapi/proxy/ppb_video_decoder_proxy.h index ffb259e..e9127a7e 100644 --- a/ppapi/proxy/ppb_video_decoder_proxy.h +++ b/ppapi/proxy/ppb_video_decoder_proxy.h @@ -40,7 +40,7 @@ class PPB_VideoDecoder_Proxy : public InterfaceProxy { ppapi::HostResource* result); void OnMsgDecode( const ppapi::HostResource& decoder, - const ppapi::HostResource& buffer, int32 id, int32 size); + const ppapi::HostResource& buffer, int32 id, uint32 size); void OnMsgAssignPictureBuffers( const ppapi::HostResource& decoder, const std::vector<PP_PictureBuffer_Dev>& buffers); diff --git a/webkit/plugins/ppapi/ppb_video_decoder_impl.cc b/webkit/plugins/ppapi/ppb_video_decoder_impl.cc index a160b6b..06c8a56 100644 --- a/webkit/plugins/ppapi/ppb_video_decoder_impl.cc +++ b/webkit/plugins/ppapi/ppb_video_decoder_impl.cc @@ -142,7 +142,7 @@ int32_t PPB_VideoDecoder_Impl::Decode( media::BitstreamBuffer decode_buffer( bitstream_buffer->id, buffer->shared_memory()->handle(), - static_cast<size_t>(bitstream_buffer->size)); + bitstream_buffer->size); if (!SetBitstreamBufferCallback(bitstream_buffer->id, callback)) return PP_ERROR_BADARGUMENT; |