Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

ui/ozone/platform/drm/gpu/gbm_surface_factory.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/platform/drm/gpu/gbm_surface_factory.h"
 
 #include <gbm.h>
 
 #include "base/files/file_path.h"
 #include "third_party/khronos/EGL/egl.h"
@@ skipping 89 matching lines @@
   if (!allow_surfaceless_)
     return nullptr;
 
   return make_scoped_ptr(new GbmSurfaceless(screen_manager_->GetWindow(widget),
                                             drm_device_manager_));
 }
 
 scoped_refptr<ui::NativePixmap> GbmSurfaceFactory::CreateNativePixmap(
     gfx::AcceleratedWidget widget,
     gfx::Size size,
-    BufferFormat format,
-    BufferUsage usage) {
+    gfx::BufferFormat format,
+    gfx::BufferUsage usage) {
 #if !defined(OS_CHROMEOS)
   // Support for memory mapping accelerated buffers requires some
   // CrOS-specific patches (using vgem).
   if (usage != SCANOUT)

[dshwang, 2015/08/03 12:37:54]

s/SCANOUT/gfx::BufferUsage::SCANOUT/

[spang, 2015/08/04 15:36:51]

Done.

     return nullptr;
 #endif
 
   scoped_refptr<GbmDevice> gbm = GetGbmDevice(widget);
   DCHECK(gbm);
 
   scoped_refptr<GbmBuffer> buffer =
       GbmBuffer::CreateBuffer(gbm, format, size, usage);
   if (!buffer.get())
     return nullptr;
 
   scoped_refptr<GbmPixmap> pixmap(new GbmPixmap(buffer, screen_manager_));
   if (!pixmap->Initialize())
     return nullptr;
 
   return pixmap;
 }
 
 bool GbmSurfaceFactory::CanShowPrimaryPlaneAsOverlay() {
   DCHECK(thread_checker_.CalledOnValidThread());
   return allow_surfaceless_;
 }
 
-bool GbmSurfaceFactory::CanCreateNativePixmap(BufferUsage usage) {
+bool GbmSurfaceFactory::CanCreateNativePixmap(gfx::BufferUsage usage) {
   DCHECK(thread_checker_.CalledOnValidThread());
   switch (usage) {
-    case MAP:
+    case gfx::BufferUsage::MAP:
       return false;
-    case PERSISTENT_MAP:
+    case gfx::BufferUsage::PERSISTENT_MAP:
       return false;
-    case SCANOUT:
+    case gfx::BufferUsage::SCANOUT:
       return true;
   }
   NOTREACHED();
   return false;
 }
 
 scoped_refptr<GbmDevice> GbmSurfaceFactory::GetGbmDevice(
     gfx::AcceleratedWidget widget) {
   return static_cast<GbmDevice*>(
       drm_device_manager_->GetDrmDevice(widget).get());
 }
 
 }  // namespace ui