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 784f75c6c900c124178e4723b99f84733424bea3..8e4c3ffc5635f0bcb5a529c93cfdff5f4cdad08f 100644 |
--- a/content/common/gpu/client/gpu_memory_buffer_impl_ozone.cc |
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_ozone.cc |
@@ -4,27 +4,32 @@ |
#include "content/common/gpu/client/gpu_memory_buffer_impl.h" |
+#include "base/bind.h" |
reveman
2014/09/09 23:17:54
nit: I don't think you need this.
alexst (slow to review)
2014/09/10 01:57:49
right, missed one, thanks.
|
#include "content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h" |
#include "content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h" |
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 (GpuMemoryBufferImplOzoneNativeBuffer::IsConfigurationSupported( |
+ internalformat, usage)) { |
+ GpuMemoryBufferImplOzoneNativeBuffer::Create( |
+ size, internalformat, usage, callback); |
+ return; |
+ } |
+ |
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>(); |
+ GpuMemoryBufferImplSharedMemory::Create( |
+ size, internalformat, usage, callback); |
+ return; |
} |
- return scoped_ptr<GpuMemoryBufferImpl>(); |
+ callback.Run(scoped_ptr<GpuMemoryBufferImpl>()); |
} |
// static |