gpu: Move image creation part of GpuMemoryBufferFactory interface to gpu namespace.

content/common/gpu/gpu_memory_buffer_factory_ozone.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 
 namespace content {
 namespace {
 
-class GpuMemoryBufferFactoryImpl : public GpuMemoryBufferFactory {
+class GpuMemoryBufferFactoryImpl : public GpuMemoryBufferFactory,
+                                   public gpu::ImageFactory {
  public:
   // Overridden from GpuMemoryBufferFactory:
   virtual gfx::GpuMemoryBufferHandle CreateGpuMemoryBuffer(
       const gfx::GpuMemoryBufferHandle& handle,
       const gfx::Size& size,
       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, format, usage)
                    ? handle
                    : gfx::GpuMemoryBufferHandle();
       default:
         NOTREACHED();
         return gfx::GpuMemoryBufferHandle();
     }
   }
   virtual void DestroyGpuMemoryBuffer(
       const gfx::GpuMemoryBufferHandle& handle) override {
     switch (handle.type) {
       case gfx::OZONE_NATIVE_BUFFER:
         ozone_buffer_factory_.DestroyGpuMemoryBuffer(handle.global_id);
         break;
       default:
         NOTREACHED();
         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,
       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));
@@ skipping 21 matching lines @@
 
 }  // namespace
 
 // static
 scoped_ptr<GpuMemoryBufferFactory> GpuMemoryBufferFactory::Create() {
   return make_scoped_ptr<GpuMemoryBufferFactory>(
       new GpuMemoryBufferFactoryImpl);
 }
 
 }  // namespace content