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 1c8e5521a01e678e32b4c84d3cb69be2689604bb..20b313d804f11c0d066164ce8b18cd60bee394a6 100644 |
--- a/content/common/gpu/client/gpu_memory_buffer_impl_mac.cc |
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_mac.cc |
@@ -9,15 +9,38 @@ |
namespace content { |
+// static |
scoped_ptr<GpuMemoryBufferImpl> GpuMemoryBufferImpl::Create( |
+ const gfx::Size& size, |
+ unsigned internalformat) { |
+ scoped_ptr<GpuMemoryBufferImplShm> buffer( |
+ new GpuMemoryBufferImplShm(size, internalformat)); |
+ if (!buffer->Initialize()) |
+ return scoped_ptr<GpuMemoryBufferImpl>(); |
+ |
+ return buffer.PassAs<GpuMemoryBufferImpl>(); |
+} |
+ |
+// static |
+void GpuMemoryBufferImpl::AllocateForChildProcess( |
+ const gfx::Size& size, |
+ unsigned internalformat, |
+ base::ProcessHandle child_process, |
+ gfx::GpuMemoryBufferHandle* handle) { |
+ GpuMemoryBufferImplShm::AllocateSharedMemoryForChildProcess( |
+ size, internalformat, child_process, handle); |
+} |
+ |
+// static |
+scoped_ptr<GpuMemoryBufferImpl> GpuMemoryBufferImpl::CreateFromHandle( |
gfx::GpuMemoryBufferHandle handle, |
- gfx::Size size, |
+ const gfx::Size& size, |
unsigned internalformat) { |
switch (handle.type) { |
case gfx::SHARED_MEMORY_BUFFER: { |
scoped_ptr<GpuMemoryBufferImplShm> buffer( |
new GpuMemoryBufferImplShm(size, internalformat)); |
- if (!buffer->Initialize(handle)) |
+ if (!buffer->InitializeFromHandle(handle)) |
return scoped_ptr<GpuMemoryBufferImpl>(); |
return buffer.PassAs<GpuMemoryBufferImpl>(); |
@@ -25,7 +48,7 @@ scoped_ptr<GpuMemoryBufferImpl> GpuMemoryBufferImpl::Create( |
case gfx::IO_SURFACE_BUFFER: { |
scoped_ptr<GpuMemoryBufferImplIOSurface> buffer( |
new GpuMemoryBufferImplIOSurface(size, internalformat)); |
- if (!buffer->Initialize(handle)) |
+ if (!buffer->InitializeFromHandle(handle)) |
return scoped_ptr<GpuMemoryBufferImpl>(); |
return buffer.PassAs<GpuMemoryBufferImpl>(); |