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 489ddd9015e2a255048297f5594d789c7181a1af..462958ad17f26600b733985e3c92009bcedf369a 100644 |
--- a/content/common/gpu/client/gpu_memory_buffer_impl_mac.cc |
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_mac.cc |
@@ -11,8 +11,8 @@ namespace content { |
// static |
void GpuMemoryBufferImpl::Create(const gfx::Size& size, |
- unsigned internalformat, |
- unsigned usage, |
+ Format format, |
+ Usage usage, |
int client_id, |
const CreationCallback& callback) { |
if (GpuMemoryBufferImplIOSurface::IsConfigurationSupported(internalformat, |
@@ -23,9 +23,8 @@ void GpuMemoryBufferImpl::Create(const gfx::Size& size, |
} |
if (GpuMemoryBufferImplSharedMemory::IsConfigurationSupported( |
- size, internalformat, usage)) { |
- GpuMemoryBufferImplSharedMemory::Create( |
- size, internalformat, usage, callback); |
+ size, format, usage)) { |
+ GpuMemoryBufferImplSharedMemory::Create(size, format, callback); |
return; |
} |
@@ -35,8 +34,8 @@ void GpuMemoryBufferImpl::Create(const gfx::Size& size, |
// static |
void GpuMemoryBufferImpl::AllocateForChildProcess( |
const gfx::Size& size, |
- unsigned internalformat, |
- unsigned usage, |
+ Format format, |
+ Usage usage, |
base::ProcessHandle child_process, |
int child_client_id, |
const AllocationCallback& callback) { |
@@ -48,9 +47,9 @@ void GpuMemoryBufferImpl::AllocateForChildProcess( |
} |
if (GpuMemoryBufferImplSharedMemory::IsConfigurationSupported( |
- size, internalformat, usage)) { |
+ size, format, usage)) { |
GpuMemoryBufferImplSharedMemory::AllocateForChildProcess( |
- size, internalformat, child_process, callback); |
+ size, format, child_process, callback); |
return; |
} |
@@ -68,15 +67,15 @@ void GpuMemoryBufferImpl::DeletedByChildProcess( |
scoped_ptr<GpuMemoryBufferImpl> GpuMemoryBufferImpl::CreateFromHandle( |
const gfx::GpuMemoryBufferHandle& handle, |
const gfx::Size& size, |
- unsigned internalformat, |
+ Format format, |
const DestructionCallback& callback) { |
switch (handle.type) { |
case gfx::SHARED_MEMORY_BUFFER: |
return GpuMemoryBufferImplSharedMemory::CreateFromHandle( |
- handle, size, internalformat, callback); |
+ handle, size, format, callback); |
case gfx::IO_SURFACE_BUFFER: |
return GpuMemoryBufferImplIOSurface::CreateFromHandle( |
- handle, size, internalformat, callback); |
+ handle, size, format, callback); |
default: |
return scoped_ptr<GpuMemoryBufferImpl>(); |
} |