Chromium Code Reviews| 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 799eff5334711476e1fb640307e8e607bd30343c..30532405f7327748ec2a0e0ea9443f4c4c748c7f 100644 |
| --- a/content/common/gpu/client/gpu_memory_buffer_impl_android.cc |
| +++ b/content/common/gpu/client/gpu_memory_buffer_impl_android.cc |
| @@ -10,21 +10,21 @@ |
| namespace content { |
| // static |
| -scoped_ptr<GpuMemoryBufferImpl> GpuMemoryBufferImpl::Create( |
| - const gfx::Size& size, |
| - unsigned internalformat, |
| - unsigned usage) { |
| +void GpuMemoryBufferImpl::Create(const gfx::Size& size, |
| + unsigned internalformat, |
| + unsigned usage, |
| + const CreationCallback& callback) { |
| if (GpuMemoryBufferImplSharedMemory::IsConfigurationSupported( |
| size, internalformat, usage)) { |
| scoped_ptr<GpuMemoryBufferImplSharedMemory> buffer( |
| new GpuMemoryBufferImplSharedMemory(size, internalformat)); |
| - if (!buffer->Initialize()) |
| - return scoped_ptr<GpuMemoryBufferImpl>(); |
| - |
| - return buffer.PassAs<GpuMemoryBufferImpl>(); |
| + if (buffer->Initialize()) { |
|
reveman
2014/09/09 17:18:26
I think we should replace the Initialize conventio
alexst (slow to review)
2014/09/09 21:53:57
Done.
|
| + callback.Run(buffer.PassAs<GpuMemoryBufferImpl>()); |
| + return; |
| + } |
| } |
| - return scoped_ptr<GpuMemoryBufferImpl>(); |
| + callback.Run(scoped_ptr<GpuMemoryBufferImpl>()); |
| } |
| // static |