Index: content/common/gpu/client/gpu_memory_buffer_impl_win.cc |
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_win.cc b/content/common/gpu/client/gpu_memory_buffer_impl_win.cc |
index 592920cdc01cc2c8d83f8968a3ab9b4e37a45c1d..6f81b0f733dc69a5046d0b38e3e9df83e7e9b9ab 100644 |
--- a/content/common/gpu/client/gpu_memory_buffer_impl_win.cc |
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_win.cc |
@@ -10,14 +10,13 @@ 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 (GpuMemoryBufferImplSharedMemory::IsConfigurationSupported( |
- size, internalformat, usage)) { |
- GpuMemoryBufferImplSharedMemory::Create( |
- size, internalformat, usage, callback); |
+ size, format, usage)) { |
+ GpuMemoryBufferImplSharedMemory::Create(size, format, callback); |
return; |
} |
@@ -27,15 +26,15 @@ 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) { |
if (GpuMemoryBufferImplSharedMemory::IsConfigurationSupported( |
- size, internalformat, usage)) { |
+ size, format, usage)) { |
GpuMemoryBufferImplSharedMemory::AllocateForChildProcess( |
- size, internalformat, child_process, callback); |
+ size, format, child_process, callback); |
return; |
} |
@@ -53,12 +52,12 @@ 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); |
default: |
return scoped_ptr<GpuMemoryBufferImpl>(); |
} |