ozone: unify GpuMemoryBufferFactoryOzoneNativePixmap in content/

ui/ozone/demo/surfaceless_gl_renderer.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 "ui/ozone/demo/surfaceless_gl_renderer.h"
 
 #include "base/bind.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_image.h"
+#include "ui/gl/gl_image_ozone_native_pixmap.h"
 #include "ui/gl/gl_surface.h"
-#include "ui/ozone/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h"
+#include "ui/ozone/public/ozone_platform.h"
+#include "ui/ozone/public/surface_factory_ozone.h"
 
 namespace ui {
 
 SurfacelessGlRenderer::BufferWrapper::BufferWrapper() {
 }
 
 SurfacelessGlRenderer::BufferWrapper::~BufferWrapper() {
   if (gl_fb_)
     glDeleteFramebuffersEXT(1, &gl_fb_);
 
   if (gl_tex_) {
     image_->ReleaseTexImage(GL_TEXTURE_2D);
     glDeleteTextures(1, &gl_tex_);
     image_->Destroy(true);
   }
 }
 
 bool SurfacelessGlRenderer::BufferWrapper::Initialize(
-    GpuMemoryBufferFactoryOzoneNativePixmap* buffer_factory,
     gfx::AcceleratedWidget widget,
     const gfx::Size& size) {
   glGenFramebuffersEXT(1, &gl_fb_);
   glGenTextures(1, &gl_tex_);
 
-  static int buffer_id_generator = 1;
-  int id = buffer_id_generator++;
-
-  buffer_factory->CreateGpuMemoryBuffer(
-      id, size, gfx::GpuMemoryBuffer::RGBX_8888, gfx::GpuMemoryBuffer::SCANOUT,
-      1, widget);
-  image_ = buffer_factory->CreateImageForGpuMemoryBuffer(
-      id, size, gfx::GpuMemoryBuffer::RGBX_8888, GL_RGB, 1);
-  // Now that we have a reference to |image_|; we can just remove it from the
-  // factory mapping.
-  buffer_factory->DestroyGpuMemoryBuffer(id, widget);
-
-  if (!image_) {
-    LOG(ERROR) << "Failed to create GL image";
+  scoped_refptr<NativePixmap> pixmap =
+      OzonePlatform::GetInstance()
+          ->GetSurfaceFactoryOzone()
+          ->CreateNativePixmap(widget, size, SurfaceFactoryOzone::RGBX_8888,
+                               SurfaceFactoryOzone::SCANOUT);
+  scoped_refptr<gfx::GLImageOzoneNativePixmap> image(
+      new gfx::GLImageOzoneNativePixmap(size, GL_RGB));
+  if (!image->Initialize(pixmap.get(), gfx::GpuMemoryBuffer::RGBX_8888)) {
+    LOG(ERROR) << "Failed to create GLImage";
     return false;
   }
+  image_ = image;
 
   glBindFramebufferEXT(GL_FRAMEBUFFER, gl_fb_);
   glBindTexture(GL_TEXTURE_2D, gl_tex_);
   image_->BindTexImage(GL_TEXTURE_2D);
 
   glFramebufferTexture2DEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
                             gl_tex_, 0);
   if (glCheckFramebufferStatusEXT(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {
     LOG(ERROR) << "Failed to create framebuffer "
                << glCheckFramebufferStatusEXT(GL_FRAMEBUFFER);
     return false;
   }
 
   widget_ = widget;
   size_ = size;
 
   return true;
 }
 
 void SurfacelessGlRenderer::BufferWrapper::BindFramebuffer() {
   glBindFramebufferEXT(GL_FRAMEBUFFER, gl_fb_);
 }
 
 void SurfacelessGlRenderer::BufferWrapper::SchedulePlane() {
   image_->ScheduleOverlayPlane(widget_, 0, gfx::OVERLAY_TRANSFORM_NONE,
                                gfx::Rect(size_), gfx::RectF(0, 0, 1, 1));
 }
 
-SurfacelessGlRenderer::SurfacelessGlRenderer(
-    gfx::AcceleratedWidget widget,
-    const gfx::Size& size,
-    GpuMemoryBufferFactoryOzoneNativePixmap* buffer_factory)
-    : GlRenderer(widget, size),
-      buffer_factory_(buffer_factory),
-      weak_ptr_factory_(this) {}
+SurfacelessGlRenderer::SurfacelessGlRenderer(gfx::AcceleratedWidget widget,
+                                             const gfx::Size& size)
+    : GlRenderer(widget, size), weak_ptr_factory_(this) {}
 
 SurfacelessGlRenderer::~SurfacelessGlRenderer() {
   // Need to make current when deleting the framebuffer resources allocated in
   // the buffers.
   context_->MakeCurrent(surface_.get());
 }
 
 bool SurfacelessGlRenderer::Initialize() {
   if (!GlRenderer::Initialize())
     return false;
 
   for (size_t i = 0; i < arraysize(buffers_); ++i)
-    if (!buffers_[i].Initialize(buffer_factory_, widget_, size_))
+    if (!buffers_[i].Initialize(widget_, size_))
       return false;
 
   PostRenderFrameTask(gfx::SwapResult::SWAP_ACK);
   return true;
 }
 
 void SurfacelessGlRenderer::RenderFrame() {
   float fraction = NextFraction();
 
   context_->MakeCurrent(surface_.get());
   buffers_[back_buffer_].BindFramebuffer();
 
   glViewport(0, 0, size_.width(), size_.height());
   glClearColor(1 - fraction, 0.0, fraction, 1.0);
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
   buffers_[back_buffer_].SchedulePlane();
   back_buffer_ ^= 1;
   if (!surface_->SwapBuffersAsync(base::Bind(&GlRenderer::PostRenderFrameTask,
                                              weak_ptr_factory_.GetWeakPtr())))
     LOG(FATAL) << "Failed to swap buffers";
 }
 
 scoped_refptr<gfx::GLSurface> SurfacelessGlRenderer::CreateSurface() {
   return gfx::GLSurface::CreateSurfacelessViewGLSurface(widget_);
 }
 
 }  // namespace ui