Index: content/common/gpu/gpu_memory_buffer_factory_mac.cc |
diff --git a/content/common/gpu/gpu_memory_buffer_factory_mac.cc b/content/common/gpu/gpu_memory_buffer_factory_mac.cc |
index 3494cd72a64cfd02cd573478ec845afb156859f8..2ad5bc92925de4797a88c08eff4fb89337be83be 100644 |
--- a/content/common/gpu/gpu_memory_buffer_factory_mac.cc |
+++ b/content/common/gpu/gpu_memory_buffer_factory_mac.cc |
@@ -6,13 +6,15 @@ |
#include "base/logging.h" |
#include "content/common/gpu/gpu_memory_buffer_factory_io_surface.h" |
+#include "gpu/command_buffer/service/image_factory.h" |
#include "ui/gl/gl_image.h" |
#include "ui/gl/gl_image_shared_memory.h" |
namespace content { |
namespace { |
-class GpuMemoryBufferFactoryImpl : public GpuMemoryBufferFactory { |
+class GpuMemoryBufferFactoryImpl : public GpuMemoryBufferFactory, |
+ public gpu::ImageFactory { |
public: |
// Overridden from GpuMemoryBufferFactory: |
gfx::GpuMemoryBufferHandle CreateGpuMemoryBuffer( |
@@ -40,6 +42,9 @@ class GpuMemoryBufferFactoryImpl : public GpuMemoryBufferFactory { |
break; |
} |
} |
+ gpu::ImageFactory* AsImageFactory() override { return this; } |
+ |
+ // Overridden from gpu::ImageFactory: |
scoped_refptr<gfx::GLImage> CreateImageForGpuMemoryBuffer( |
const gfx::GpuMemoryBufferHandle& handle, |
const gfx::Size& size, |