| Index: content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h
|
| diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h b/content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h
|
| index 9ac97419d35a75c5ee483e0a2d846bc21a59d5d8..eb3c9113cbf319d97d152cbf75afc8b2778fc14c 100644
|
| --- a/content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h
|
| +++ b/content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h
|
| @@ -13,26 +13,26 @@ namespace content {
|
| class GpuMemoryBufferImplSharedMemory : public GpuMemoryBufferImpl {
|
| public:
|
| static void Create(const gfx::Size& size,
|
| - unsigned internalformat,
|
| - unsigned usage,
|
| + Format format,
|
| const CreationCallback& callback);
|
|
|
| static void AllocateForChildProcess(const gfx::Size& size,
|
| - unsigned internalformat,
|
| + Format format,
|
| base::ProcessHandle child_process,
|
| const AllocationCallback& callback);
|
|
|
| static scoped_ptr<GpuMemoryBufferImpl> CreateFromHandle(
|
| const gfx::GpuMemoryBufferHandle& handle,
|
| const gfx::Size& size,
|
| - unsigned internalformat,
|
| + Format format,
|
| const DestructionCallback& callback);
|
|
|
| - static bool IsLayoutSupported(const gfx::Size& size, unsigned internalformat);
|
| - static bool IsUsageSupported(unsigned usage);
|
| + static bool IsFormatSupported(Format format);
|
| + static bool IsUsageSupported(Usage usage);
|
| + static bool IsLayoutSupported(const gfx::Size& size, Format format);
|
| static bool IsConfigurationSupported(const gfx::Size& size,
|
| - unsigned internalformat,
|
| - unsigned usage);
|
| + Format format,
|
| + Usage usage);
|
|
|
| // Overridden from gfx::GpuMemoryBuffer:
|
| virtual void* Map() override;
|
| @@ -42,7 +42,7 @@ class GpuMemoryBufferImplSharedMemory : public GpuMemoryBufferImpl {
|
|
|
| private:
|
| GpuMemoryBufferImplSharedMemory(const gfx::Size& size,
|
| - unsigned internalformat,
|
| + Format format,
|
| const DestructionCallback& callback,
|
| scoped_ptr<base::SharedMemory> shared_memory);
|
| virtual ~GpuMemoryBufferImplSharedMemory();
|
|
|