| 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 be0492ab076d8b3e3453c9ac10e38e854a979990..4259a4653f5e3d9177b0ffa156716529a02ad049 100644
|
| --- a/content/common/gpu/gpu_memory_buffer_factory_ozone.cc
|
| +++ b/content/common/gpu/gpu_memory_buffer_factory_ozone.cc
|
| @@ -5,6 +5,7 @@
|
| #include "content/common/gpu/gpu_memory_buffer_factory.h"
|
|
|
| #include "base/logging.h"
|
| +#include "gpu/command_buffer/service/image_factory.h"
|
| #include "ui/gl/gl_image.h"
|
| #include "ui/gl/gl_image_shared_memory.h"
|
| #include "ui/ozone/gpu/gpu_memory_buffer_factory_ozone_native_buffer.h"
|
| @@ -12,7 +13,8 @@
|
| namespace content {
|
| namespace {
|
|
|
| -class GpuMemoryBufferFactoryImpl : public GpuMemoryBufferFactory {
|
| +class GpuMemoryBufferFactoryImpl : public GpuMemoryBufferFactory,
|
| + public gpu::ImageFactory {
|
| public:
|
| // Overridden from GpuMemoryBufferFactory:
|
| virtual gfx::GpuMemoryBufferHandle CreateGpuMemoryBuffer(
|
| @@ -42,6 +44,9 @@ class GpuMemoryBufferFactoryImpl : public GpuMemoryBufferFactory {
|
| break;
|
| }
|
| }
|
| + virtual gpu::ImageFactory* AsImageFactory() override { return this; }
|
| +
|
| + // Overridden from gpu::ImageFactory:
|
| virtual scoped_refptr<gfx::GLImage> CreateImageForGpuMemoryBuffer(
|
| const gfx::GpuMemoryBufferHandle& handle,
|
| const gfx::Size& size,
|
|
|