| Index: content/common/gpu/client/gpu_memory_buffer_impl_android.cc
|
| diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_android.cc b/content/common/gpu/client/gpu_memory_buffer_impl_android.cc
|
| index a85654226ab1ba8908231bc9eb5d5b827faf1d84..0b8a2892d99dc694067aa1851acee676393d59af 100644
|
| --- a/content/common/gpu/client/gpu_memory_buffer_impl_android.cc
|
| +++ b/content/common/gpu/client/gpu_memory_buffer_impl_android.cc
|
| @@ -60,7 +60,24 @@ void GpuMemoryBufferImpl::AllocateForChildProcess(
|
| void GpuMemoryBufferImpl::DeletedByChildProcess(
|
| gfx::GpuMemoryBufferType type,
|
| const gfx::GpuMemoryBufferId& id,
|
| - base::ProcessHandle child_process) {
|
| + base::ProcessHandle child_process,
|
| + int child_client_id,
|
| + uint32 sync_point) {
|
| + switch (type) {
|
| + case gfx::SHARED_MEMORY_BUFFER:
|
| + break;
|
| + case gfx::SURFACE_TEXTURE_BUFFER:
|
| + if (id.secondary_id != child_client_id) {
|
| + LOG(ERROR)
|
| + << "Child attempting to delete GpuMemoryBuffer it does not own";
|
| + } else {
|
| + GpuMemoryBufferImplSurfaceTexture::DeletedByChildProcess(id,
|
| + sync_point);
|
| + }
|
| + break;
|
| + default:
|
| + NOTREACHED();
|
| + }
|
| }
|
|
|
| // static
|
|
|