| Index: content/common/gpu/gpu_memory_buffer_factory_ozone.cc
|
| diff --git a/content/common/gpu/gpu_memory_buffer_factory_ozone.cc b/content/common/gpu/gpu_memory_buffer_factory_ozone.cc
|
| index a077915851240574234d085da267eb044059b6a2..1379085c6f8ee096822af4d8d574cd9168a49121 100644
|
| --- a/content/common/gpu/gpu_memory_buffer_factory_ozone.cc
|
| +++ b/content/common/gpu/gpu_memory_buffer_factory_ozone.cc
|
| @@ -18,12 +18,12 @@ class GpuMemoryBufferFactoryImpl : public GpuMemoryBufferFactory {
|
| virtual gfx::GpuMemoryBufferHandle CreateGpuMemoryBuffer(
|
| const gfx::GpuMemoryBufferHandle& handle,
|
| const gfx::Size& size,
|
| - unsigned internalformat,
|
| - unsigned usage) override {
|
| + gfx::GpuMemoryBuffer::Format format,
|
| + gfx::GpuMemoryBuffer::Usage usage) override {
|
| switch (handle.type) {
|
| case gfx::OZONE_NATIVE_BUFFER:
|
| return ozone_buffer_factory_.CreateGpuMemoryBuffer(
|
| - handle.global_id, size, internalformat, usage)
|
| + handle.global_id, size, format, usage)
|
| ? handle
|
| : gfx::GpuMemoryBufferHandle();
|
| default:
|
| @@ -45,13 +45,14 @@ class GpuMemoryBufferFactoryImpl : public GpuMemoryBufferFactory {
|
| virtual scoped_refptr<gfx::GLImage> CreateImageForGpuMemoryBuffer(
|
| const gfx::GpuMemoryBufferHandle& handle,
|
| const gfx::Size& size,
|
| + gfx::GpuMemoryBuffer::Format format,
|
| unsigned internalformat,
|
| int client_id) override {
|
| switch (handle.type) {
|
| case gfx::SHARED_MEMORY_BUFFER: {
|
| scoped_refptr<gfx::GLImageSharedMemory> image(
|
| new gfx::GLImageSharedMemory(size, internalformat));
|
| - if (!image->Initialize(handle))
|
| + if (!image->Initialize(handle, format))
|
| return NULL;
|
|
|
| return image;
|
|
|