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 110a6559d3d0ae1de8e51909d951be86b0cccf68..8ceb902e07e4655dda409d6a41454fa74ce33ebe 100644 |
--- a/content/common/gpu/client/gpu_memory_buffer_impl_android.cc |
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_android.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,8 @@ scoped_ptr<GpuMemoryBufferImpl> GpuMemoryBufferImpl::CreateFromHandle( |
} |
case gfx::SURFACE_TEXTURE_BUFFER: { |
scoped_ptr<GpuMemoryBufferImplSurfaceTexture> buffer( |
- new GpuMemoryBufferImplSurfaceTexture(size, internalformat)); |
+ new GpuMemoryBufferImplSurfaceTexture( |
+ size, internalformat, callback)); |
if (!buffer->InitializeFromHandle(handle)) |
return scoped_ptr<GpuMemoryBufferImpl>(); |