| Index: content/common/gpu/client/gpu_memory_buffer_impl_mac.cc
|
| diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_mac.cc b/content/common/gpu/client/gpu_memory_buffer_impl_mac.cc
|
| index 5c0d1f76c77dd90b4f90e3d250d085bb15e71da4..e2be138d024438d0eb51090df770a794c0065a0e 100644
|
| --- a/content/common/gpu/client/gpu_memory_buffer_impl_mac.cc
|
| +++ b/content/common/gpu/client/gpu_memory_buffer_impl_mac.cc
|
| @@ -54,11 +54,12 @@ void GpuMemoryBufferImpl::DeletedByChildProcess(
|
| scoped_ptr<GpuMemoryBufferImpl> GpuMemoryBufferImpl::CreateFromHandle(
|
| const gfx::GpuMemoryBufferHandle& handle,
|
| const gfx::Size& size,
|
| - unsigned internalformat) {
|
| + unsigned internalformat,
|
| + const DestructionCallback& callback) {
|
| switch (handle.type) {
|
| case gfx::SHARED_MEMORY_BUFFER: {
|
| scoped_ptr<GpuMemoryBufferImplSharedMemory> buffer(
|
| - new GpuMemoryBufferImplSharedMemory(size, internalformat));
|
| + new GpuMemoryBufferImplSharedMemory(size, internalformat, callback));
|
| if (!buffer->InitializeFromHandle(handle))
|
| return scoped_ptr<GpuMemoryBufferImpl>();
|
|
|
| @@ -66,7 +67,7 @@ scoped_ptr<GpuMemoryBufferImpl> GpuMemoryBufferImpl::CreateFromHandle(
|
| }
|
| case gfx::IO_SURFACE_BUFFER: {
|
| scoped_ptr<GpuMemoryBufferImplIOSurface> buffer(
|
| - new GpuMemoryBufferImplIOSurface(size, internalformat));
|
| + new GpuMemoryBufferImplIOSurface(size, internalformat, callback));
|
| if (!buffer->InitializeFromHandle(handle))
|
| return scoped_ptr<GpuMemoryBufferImpl>();
|
|
|
|
|