summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpalmer@chromium.org <palmer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-04 06:16:40 +0000
committerpalmer@chromium.org <palmer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-04 06:16:40 +0000
commit2ab991ae67d4c0c9989beac13398c2374f2e73f5 (patch)
tree6e423741772e5a5282c78acf2b4a8f83c60c5349
parent324f4b1fa1d4d9434c1eb9f8bb4e1340fb58d579 (diff)
downloadchromium_src-2ab991ae67d4c0c9989beac13398c2374f2e73f5.zip
chromium_src-2ab991ae67d4c0c9989beac13398c2374f2e73f5.tar.gz
chromium_src-2ab991ae67d4c0c9989beac13398c2374f2e73f5.tar.bz2
Use explicitly-sized types across the IPC boundary.
BUG=none Review URL: https://chromiumcodereview.appspot.com/16105014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203862 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/browser/renderer_host/render_message_filter.cc2
-rw-r--r--content/browser/renderer_host/render_message_filter.h2
-rw-r--r--content/common/view_messages.h2
-rw-r--r--content/common/webkitplatformsupport_impl.cc2
-rw-r--r--media/base/android/webaudio_media_codec_bridge.cc4
-rw-r--r--media/base/android/webaudio_media_codec_bridge.h6
6 files changed, 9 insertions, 9 deletions
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
index 255d7ad..e7466cd 100644
--- a/content/browser/renderer_host/render_message_filter.cc
+++ b/content/browser/renderer_host/render_message_filter.cc
@@ -1159,7 +1159,7 @@ void RenderMessageFilter::OnPreCacheFontCharacters(const LOGFONT& font,
void RenderMessageFilter::OnWebAudioMediaCodec(
base::SharedMemoryHandle encoded_data_handle,
base::FileDescriptor pcm_output,
- size_t data_size) {
+ uint32_t data_size) {
// Let a WorkerPool handle this request since the WebAudio
// MediaCodec bridge is slow and can block while sending the data to
// the renderer.
diff --git a/content/browser/renderer_host/render_message_filter.h b/content/browser/renderer_host/render_message_filter.h
index 5e64fb0..5cd42ae 100644
--- a/content/browser/renderer_host/render_message_filter.h
+++ b/content/browser/renderer_host/render_message_filter.h
@@ -264,7 +264,7 @@ class RenderMessageFilter : public BrowserMessageFilter {
#if defined(OS_ANDROID)
void OnWebAudioMediaCodec(base::SharedMemoryHandle encoded_data_handle,
base::FileDescriptor pcm_output,
- size_t data_size);
+ uint32_t data_size);
#endif
// Cached resource request dispatcher host and plugin service, guaranteed to
diff --git a/content/common/view_messages.h b/content/common/view_messages.h
index d240e4c..37e0f8c 100644
--- a/content/common/view_messages.h
+++ b/content/common/view_messages.h
@@ -2269,7 +2269,7 @@ IPC_MESSAGE_ROUTED1(ViewHostMsg_ImeBatchStateChanged_ACK,
IPC_MESSAGE_CONTROL3(ViewHostMsg_RunWebAudioMediaCodec,
base::SharedMemoryHandle /* encoded_data_handle */,
base::FileDescriptor /* pcm_output */,
- size_t /* data_size*/)
+ uint32_t /* data_size*/)
// Sent by renderer to request a ViewMsg_BeginFrame message for upcoming
// display events. If |enabled| is true, the BeginFrame message will continue
diff --git a/content/common/webkitplatformsupport_impl.cc b/content/common/webkitplatformsupport_impl.cc
index b6c0728..a39e27e 100644
--- a/content/common/webkitplatformsupport_impl.cc
+++ b/content/common/webkitplatformsupport_impl.cc
@@ -18,7 +18,7 @@ namespace {
void RunWebAudioMediaCodec(
base::SharedMemoryHandle encoded_data_handle,
base::FileDescriptor pcm_output,
- size_t data_size) {
+ uint32_t data_size) {
content::ChildThread::current()->Send(
new ViewHostMsg_RunWebAudioMediaCodec(encoded_data_handle,
pcm_output,
diff --git a/media/base/android/webaudio_media_codec_bridge.cc b/media/base/android/webaudio_media_codec_bridge.cc
index 7a21261..fdc5e5f 100644
--- a/media/base/android/webaudio_media_codec_bridge.cc
+++ b/media/base/android/webaudio_media_codec_bridge.cc
@@ -25,7 +25,7 @@ namespace media {
void WebAudioMediaCodecBridge::RunWebAudioMediaCodec(
base::SharedMemoryHandle encoded_audio_handle,
base::FileDescriptor pcm_output,
- size_t data_size) {
+ uint32_t data_size) {
WebAudioMediaCodecBridge bridge(encoded_audio_handle, pcm_output, data_size);
bridge.DecodeInMemoryAudioFile();
@@ -34,7 +34,7 @@ void WebAudioMediaCodecBridge::RunWebAudioMediaCodec(
WebAudioMediaCodecBridge::WebAudioMediaCodecBridge(
base::SharedMemoryHandle encoded_audio_handle,
base::FileDescriptor pcm_output,
- size_t data_size)
+ uint32_t data_size)
: encoded_audio_handle_(encoded_audio_handle.fd),
pcm_output_(pcm_output.fd),
data_size_(data_size) {
diff --git a/media/base/android/webaudio_media_codec_bridge.h b/media/base/android/webaudio_media_codec_bridge.h
index 573fec2..7709756 100644
--- a/media/base/android/webaudio_media_codec_bridge.h
+++ b/media/base/android/webaudio_media_codec_bridge.h
@@ -24,7 +24,7 @@ class MEDIA_EXPORT WebAudioMediaCodecBridge {
// We also take ownership of |pcm_output|.
WebAudioMediaCodecBridge(base::SharedMemoryHandle encoded_audio_handle,
base::FileDescriptor pcm_output,
- size_t data_size);
+ uint32_t data_size);
~WebAudioMediaCodecBridge();
// Inform JNI about this bridge. Returns true if registration
@@ -36,7 +36,7 @@ class MEDIA_EXPORT WebAudioMediaCodecBridge {
static void RunWebAudioMediaCodec(
base::SharedMemoryHandle encoded_audio_handle,
base::FileDescriptor pcm_output,
- size_t data_size);
+ uint32_t data_size);
void OnChunkDecoded(JNIEnv* env,
jobject /*java object*/,
@@ -64,7 +64,7 @@ class MEDIA_EXPORT WebAudioMediaCodecBridge {
int pcm_output_;
// The length of the encoded data.
- size_t data_size_;
+ uint32_t data_size_;
DISALLOW_COPY_AND_ASSIGN(WebAudioMediaCodecBridge);
};