| 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 643629ee8688f3861fc3b21bb2ccdaee2611c6c7..b0c287c5cad847b20fee811cafc309734fa44256 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
|
| @@ -17,13 +17,13 @@ class GpuMemoryBufferImplSurfaceTexture : public GpuMemoryBufferImpl {
|
| 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;
|
| @@ -34,7 +34,7 @@ class GpuMemoryBufferImplSurfaceTexture : public GpuMemoryBufferImpl {
|
| private:
|
| GpuMemoryBufferImplSurfaceTexture(
|
| const gfx::Size& size,
|
| - unsigned internalformat,
|
| + Format format,
|
| const DestructionCallback& callback,
|
| const gfx::SurfaceTextureId& surface_texture_id,
|
| ANativeWindow* native_window);
|
|
|