Index: content/common/gpu/gpu_memory_buffer_factory_win.cc |
diff --git a/content/common/gpu/gpu_memory_buffer_factory_win.cc b/content/common/gpu/gpu_memory_buffer_factory_win.cc |
index fde3e2aae19d227289130cf344ec817723681c88..75d91d24c91d111956f658371f1e12cf5f4d4bac 100644 |
--- a/content/common/gpu/gpu_memory_buffer_factory_win.cc |
+++ b/content/common/gpu/gpu_memory_buffer_factory_win.cc |
@@ -5,13 +5,15 @@ |
#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" |
namespace content { |
namespace { |
-class GpuMemoryBufferFactoryImpl : public GpuMemoryBufferFactory { |
+class GpuMemoryBufferFactoryImpl : public GpuMemoryBufferFactory, |
+ public gpu::ImageFactory { |
public: |
// Overridden from GpuMemoryBufferFactory: |
virtual gfx::GpuMemoryBufferHandle CreateGpuMemoryBuffer( |
@@ -26,6 +28,9 @@ class GpuMemoryBufferFactoryImpl : public GpuMemoryBufferFactory { |
const gfx::GpuMemoryBufferHandle& handle) override { |
NOTREACHED(); |
} |
+ 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, |