summaryrefslogtreecommitdiffstats
path: root/content/common
diff options
context:
space:
mode:
authorcevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-08 06:00:39 +0000
committercevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-08 06:00:39 +0000
commit0ab5fab4939150bd0f30ada8a4bf6eb0f69d66c1 (patch)
tree267d22012a9b7b522391723529e9b54a6ddd2900 /content/common
parent2bec3f1b0086e95d068440f774ccd14cea66cc64 (diff)
downloadchromium_src-0ab5fab4939150bd0f30ada8a4bf6eb0f69d66c1.zip
chromium_src-0ab5fab4939150bd0f30ada8a4bf6eb0f69d66c1.tar.gz
chromium_src-0ab5fab4939150bd0f30ada8a4bf6eb0f69d66c1.tar.bz2
Sizes going across an IPC should be uint32.
BUG=164946 Review URL: https://chromiumcodereview.appspot.com/11472038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171944 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common')
-rw-r--r--content/common/gpu/gpu_command_buffer_stub.cc4
-rw-r--r--content/common/gpu/gpu_command_buffer_stub.h4
-rw-r--r--content/common/gpu/gpu_messages.h6
-rw-r--r--content/common/gpu/media/gpu_video_decode_accelerator.cc2
-rw-r--r--content/common/gpu/media/gpu_video_decode_accelerator.h2
5 files changed, 9 insertions, 9 deletions
diff --git a/content/common/gpu/gpu_command_buffer_stub.cc b/content/common/gpu/gpu_command_buffer_stub.cc
index e2f1e15..8eefd15 100644
--- a/content/common/gpu/gpu_command_buffer_stub.cc
+++ b/content/common/gpu/gpu_command_buffer_stub.cc
@@ -642,7 +642,7 @@ void GpuCommandBufferStub::OnRescheduled() {
ReportState();
}
-void GpuCommandBufferStub::OnCreateTransferBuffer(int32 size,
+void GpuCommandBufferStub::OnCreateTransferBuffer(uint32 size,
int32 id_request,
IPC::Message* reply_message) {
TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnCreateTransferBuffer");
@@ -658,7 +658,7 @@ void GpuCommandBufferStub::OnCreateTransferBuffer(int32 size,
void GpuCommandBufferStub::OnRegisterTransferBuffer(
base::SharedMemoryHandle transfer_buffer,
- size_t size,
+ uint32 size,
int32 id_request,
IPC::Message* reply_message) {
TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnRegisterTransferBuffer");
diff --git a/content/common/gpu/gpu_command_buffer_stub.h b/content/common/gpu/gpu_command_buffer_stub.h
index 3baed15..0519e8c 100644
--- a/content/common/gpu/gpu_command_buffer_stub.h
+++ b/content/common/gpu/gpu_command_buffer_stub.h
@@ -152,11 +152,11 @@ class GpuCommandBufferStub
void OnAsyncFlush(int32 put_offset, uint32 flush_count);
void OnEcho(const IPC::Message& message);
void OnRescheduled();
- void OnCreateTransferBuffer(int32 size,
+ void OnCreateTransferBuffer(uint32 size,
int32 id_request,
IPC::Message* reply_message);
void OnRegisterTransferBuffer(base::SharedMemoryHandle transfer_buffer,
- size_t size,
+ uint32 size,
int32 id_request,
IPC::Message* reply_message);
void OnDestroyTransferBuffer(int32 id, IPC::Message* reply_message);
diff --git a/content/common/gpu/gpu_messages.h b/content/common/gpu/gpu_messages.h
index 3f3cf67..d72bf05 100644
--- a/content/common/gpu/gpu_messages.h
+++ b/content/common/gpu/gpu_messages.h
@@ -529,7 +529,7 @@ IPC_MESSAGE_ROUTED1(GpuCommandBufferMsg_ConsoleMsg,
// Create a shared memory transfer buffer. Returns an id that can be used to
// identify the transfer buffer from a comment.
IPC_SYNC_MESSAGE_ROUTED2_1(GpuCommandBufferMsg_CreateTransferBuffer,
- int32 /* size */,
+ uint32 /* size */,
int32 /* id_request (-1 means any) */,
int32 /* id */)
@@ -537,7 +537,7 @@ IPC_SYNC_MESSAGE_ROUTED2_1(GpuCommandBufferMsg_CreateTransferBuffer,
// used to identify the transfer buffer from a command buffer.
IPC_SYNC_MESSAGE_ROUTED3_1(GpuCommandBufferMsg_RegisterTransferBuffer,
base::SharedMemoryHandle /* transfer_buffer */,
- size_t /* size */,
+ uint32 /* size */,
int32 /* id_request (-1 means any) */,
int32 /* id */)
@@ -649,7 +649,7 @@ IPC_MESSAGE_ROUTED1(GpuCommandBufferMsg_SignalSyncPointAck,
IPC_MESSAGE_ROUTED3(AcceleratedVideoDecoderMsg_Decode,
base::SharedMemoryHandle, /* input_buffer_handle */
int32, /* bitstream_buffer_id */
- int32) /* size */
+ uint32) /* size */
// Sent from Renderer process to the GPU process to give the texture IDs for
// the textures the decoder will use for output.
diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.cc b/content/common/gpu/media/gpu_video_decode_accelerator.cc
index cf869ad..5e0521f 100644
--- a/content/common/gpu/media/gpu_video_decode_accelerator.cc
+++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc
@@ -203,7 +203,7 @@ void GpuVideoDecodeAccelerator::Initialize(
}
void GpuVideoDecodeAccelerator::OnDecode(
- base::SharedMemoryHandle handle, int32 id, int32 size) {
+ base::SharedMemoryHandle handle, int32 id, uint32 size) {
DCHECK(video_decode_accelerator_.get());
video_decode_accelerator_->Decode(media::BitstreamBuffer(id, handle, size));
}
diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.h b/content/common/gpu/media/gpu_video_decode_accelerator.h
index 1574b96..1aee14c 100644
--- a/content/common/gpu/media/gpu_video_decode_accelerator.h
+++ b/content/common/gpu/media/gpu_video_decode_accelerator.h
@@ -61,7 +61,7 @@ class GpuVideoDecodeAccelerator
private:
// Handlers for IPC messages.
- void OnDecode(base::SharedMemoryHandle handle, int32 id, int32 size);
+ void OnDecode(base::SharedMemoryHandle handle, int32 id, uint32 size);
void OnAssignPictureBuffers(
const std::vector<int32>& buffer_ids,
const std::vector<uint32>& texture_ids,