| Index: content/common/gpu/client/gpu_memory_buffer_impl_win.cc
|
| diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_win.cc b/content/common/gpu/client/gpu_memory_buffer_impl_win.cc
|
| index 8a5c468aef1dbc1b49f211cde5d83d1e79f3a631..3c144f37ccf6b6159d2ba9692fffccf3b23b9e87 100644
|
| --- a/content/common/gpu/client/gpu_memory_buffer_impl_win.cc
|
| +++ b/content/common/gpu/client/gpu_memory_buffer_impl_win.cc
|
| @@ -9,14 +9,15 @@
|
| namespace content {
|
|
|
| // static
|
| -void GpuMemoryBufferImpl::Create(const gfx::Size& size,
|
| +void GpuMemoryBufferImpl::Create(gfx::GpuMemoryBufferId id,
|
| + const gfx::Size& size,
|
| Format format,
|
| Usage usage,
|
| int client_id,
|
| const CreationCallback& callback) {
|
| if (GpuMemoryBufferImplSharedMemory::IsConfigurationSupported(
|
| size, format, usage)) {
|
| - GpuMemoryBufferImplSharedMemory::Create(size, format, callback);
|
| + GpuMemoryBufferImplSharedMemory::Create(id, size, format, callback);
|
| return;
|
| }
|
|
|
| @@ -25,6 +26,7 @@ void GpuMemoryBufferImpl::Create(const gfx::Size& size,
|
|
|
| // static
|
| void GpuMemoryBufferImpl::AllocateForChildProcess(
|
| + gfx::GpuMemoryBufferId id,
|
| const gfx::Size& size,
|
| Format format,
|
| Usage usage,
|
| @@ -34,7 +36,7 @@ void GpuMemoryBufferImpl::AllocateForChildProcess(
|
| if (GpuMemoryBufferImplSharedMemory::IsConfigurationSupported(
|
| size, format, usage)) {
|
| GpuMemoryBufferImplSharedMemory::AllocateForChildProcess(
|
| - size, format, child_process, callback);
|
| + id, size, format, child_process, callback);
|
| return;
|
| }
|
|
|
| @@ -44,7 +46,7 @@ void GpuMemoryBufferImpl::AllocateForChildProcess(
|
| // static
|
| void GpuMemoryBufferImpl::DeletedByChildProcess(
|
| gfx::GpuMemoryBufferType type,
|
| - const gfx::GpuMemoryBufferId& id,
|
| + gfx::GpuMemoryBufferId id,
|
| base::ProcessHandle child_process,
|
| int child_client_id,
|
| uint32 sync_point) {
|
|
|