| 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 0e77f468d22d69f66008a601e8ecd685c9cd47ec..a6a4abc46f722eeb96846e402a4e770e7a52813a 100644
|
| --- a/content/common/gpu/client/gpu_memory_buffer_impl_mac.cc
|
| +++ b/content/common/gpu/client/gpu_memory_buffer_impl_mac.cc
|
| @@ -5,7 +5,7 @@
|
| #include "content/common/gpu/client/gpu_memory_buffer_impl.h"
|
|
|
| #include "content/common/gpu/client/gpu_memory_buffer_impl_io_surface.h"
|
| -#include "content/common/gpu/client/gpu_memory_buffer_impl_shm.h"
|
| +#include "content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h"
|
|
|
| namespace content {
|
|
|
| @@ -14,10 +14,10 @@ scoped_ptr<GpuMemoryBufferImpl> GpuMemoryBufferImpl::Create(
|
| const gfx::Size& size,
|
| unsigned internalformat,
|
| unsigned usage) {
|
| - if (GpuMemoryBufferImplShm::IsConfigurationSupported(
|
| + if (GpuMemoryBufferImplSharedMemory::IsConfigurationSupported(
|
| size, internalformat, usage)) {
|
| - scoped_ptr<GpuMemoryBufferImplShm> buffer(
|
| - new GpuMemoryBufferImplShm(size, internalformat));
|
| + scoped_ptr<GpuMemoryBufferImplSharedMemory> buffer(
|
| + new GpuMemoryBufferImplSharedMemory(size, internalformat));
|
| if (!buffer->Initialize())
|
| return scoped_ptr<GpuMemoryBufferImpl>();
|
|
|
| @@ -34,9 +34,9 @@ void GpuMemoryBufferImpl::AllocateForChildProcess(
|
| unsigned usage,
|
| base::ProcessHandle child_process,
|
| const AllocationCallback& callback) {
|
| - if (GpuMemoryBufferImplShm::IsConfigurationSupported(
|
| + if (GpuMemoryBufferImplSharedMemory::IsConfigurationSupported(
|
| size, internalformat, usage)) {
|
| - GpuMemoryBufferImplShm::AllocateSharedMemoryForChildProcess(
|
| + GpuMemoryBufferImplSharedMemory::AllocateSharedMemoryForChildProcess(
|
| size, internalformat, child_process, callback);
|
| return;
|
| }
|
| @@ -51,8 +51,8 @@ scoped_ptr<GpuMemoryBufferImpl> GpuMemoryBufferImpl::CreateFromHandle(
|
| unsigned internalformat) {
|
| switch (handle.type) {
|
| case gfx::SHARED_MEMORY_BUFFER: {
|
| - scoped_ptr<GpuMemoryBufferImplShm> buffer(
|
| - new GpuMemoryBufferImplShm(size, internalformat));
|
| + scoped_ptr<GpuMemoryBufferImplSharedMemory> buffer(
|
| + new GpuMemoryBufferImplSharedMemory(size, internalformat));
|
| if (!buffer->InitializeFromHandle(handle))
|
| return scoped_ptr<GpuMemoryBufferImpl>();
|
|
|
|
|