| Index: content/common/gpu/client/gpu_memory_buffer_impl_ozone.cc
|
| diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_ozone.cc b/content/common/gpu/client/gpu_memory_buffer_impl_ozone.cc
|
| index ca2873f82a4b08c162fbb7f596f9f5ee09681787..fd2304943adcb67aaf77a5d56ac8a9943339dce1 100644
|
| --- a/content/common/gpu/client/gpu_memory_buffer_impl_ozone.cc
|
| +++ b/content/common/gpu/client/gpu_memory_buffer_impl_ozone.cc
|
| @@ -68,11 +68,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>();
|
|
|
| @@ -80,7 +81,8 @@ scoped_ptr<GpuMemoryBufferImpl> GpuMemoryBufferImpl::CreateFromHandle(
|
| }
|
| case gfx::OZONE_NATIVE_BUFFER: {
|
| scoped_ptr<GpuMemoryBufferImplOzoneNativeBuffer> buffer(
|
| - new GpuMemoryBufferImplOzoneNativeBuffer(size, internalformat));
|
| + new GpuMemoryBufferImplOzoneNativeBuffer(
|
| + size, internalformat, callback));
|
| if (!buffer->InitializeFromHandle(handle))
|
| return scoped_ptr<GpuMemoryBufferImpl>();
|
|
|
|
|