| Index: content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h
|
| diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h b/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h
|
| index fdc42f44bb26568ae6dd0c0d4ca3f3e85ca721d4..f2745d13ae3cdb0499cd1c1161f8a8639ec32a8c 100644
|
| --- a/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h
|
| +++ b/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h
|
| @@ -15,27 +15,25 @@ namespace content {
|
| class GpuMemoryBufferImplSurfaceTexture : public GpuMemoryBufferImpl {
|
| public:
|
| static void Create(const gfx::Size& size,
|
| - unsigned internalformat,
|
| - unsigned usage,
|
| + Format format,
|
| int client_id,
|
| const CreationCallback& callback);
|
|
|
| static void AllocateForChildProcess(const gfx::Size& size,
|
| - unsigned internalformat,
|
| - unsigned usage,
|
| + Format format,
|
| int child_client_id,
|
| 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 IsFormatSupported(unsigned internalformat);
|
| - static bool IsUsageSupported(unsigned usage);
|
| - static bool IsConfigurationSupported(unsigned internalformat, unsigned usage);
|
| - static int WindowFormat(unsigned internalformat);
|
| + static bool IsFormatSupported(Format format);
|
| + static bool IsUsageSupported(Usage usage);
|
| + static bool IsConfigurationSupported(Format format, Usage usage);
|
| + static int WindowFormat(Format format);
|
|
|
| // Overridden from gfx::GpuMemoryBuffer:
|
| virtual void* Map() override;
|
| @@ -45,7 +43,7 @@ class GpuMemoryBufferImplSurfaceTexture : public GpuMemoryBufferImpl {
|
|
|
| private:
|
| GpuMemoryBufferImplSurfaceTexture(const gfx::Size& size,
|
| - unsigned internalformat,
|
| + Format format,
|
| const DestructionCallback& callback,
|
| const gfx::GpuMemoryBufferId& id,
|
| ANativeWindow* native_window);
|
|
|