Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

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"
@@ skipping 20 matching lines @@
 
 bool SurfacelessGlRenderer::BufferWrapper::Initialize(
     gfx::AcceleratedWidget widget,
     const gfx::Size& size) {
   glGenFramebuffersEXT(1, &gl_fb_);
   glGenTextures(1, &gl_tex_);
 
   scoped_refptr<NativePixmap> pixmap =
       OzonePlatform::GetInstance()
           ->GetSurfaceFactoryOzone()
-          ->CreateNativePixmap(widget, size, SurfaceFactoryOzone::RGBX_8888,
-                               SurfaceFactoryOzone::SCANOUT);
+          ->CreateNativePixmap(widget, size, gfx::BufferFormat::RGBX_8888,
+                               gfx::BufferUsage::SCANOUT);
   scoped_refptr<gfx::GLImageOzoneNativePixmap> image(
       new gfx::GLImageOzoneNativePixmap(size, GL_RGB));
-  if (!image->Initialize(pixmap.get(), gfx::GpuMemoryBuffer::RGBX_8888)) {
+  if (!image->Initialize(pixmap.get(), gfx::BufferFormat::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,
@@ skipping 56 matching lines @@
   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