Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

ui/ozone/platform/drm/gpu/gbm_buffer.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_buffer.h"
 
 #include <drm.h>
 #include <fcntl.h>
 #include <gbm.h>
 #include <xf86drm.h>
 
 #include "base/logging.h"
 #include "base/trace_event/trace_event.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/ozone/platform/drm/gpu/drm_window.h"
 #include "ui/ozone/platform/drm/gpu/gbm_device.h"
 
 namespace ui {
 
 namespace {
 
-int GetGbmFormatFromBufferFormat(SurfaceFactoryOzone::BufferFormat fmt) {
+int GetGbmFormatFromBufferFormat(gfx::BufferFormat fmt) {
   switch (fmt) {
-    case SurfaceFactoryOzone::BGRA_8888:
+    case gfx::BufferFormat::BGRA_8888:
       return GBM_BO_FORMAT_ARGB8888;
-    case SurfaceFactoryOzone::RGBX_8888:
+    case gfx::BufferFormat::RGBX_8888:
       return GBM_BO_FORMAT_XRGB8888;
     default:
       NOTREACHED();
       return 0;
   }
 }
 
 }  // namespace
 
 GbmBuffer::GbmBuffer(const scoped_refptr<GbmDevice>& gbm,
                      gbm_bo* bo,
                      bool scanout)
     : GbmBufferBase(gbm, bo, scanout) {
 }
 
 GbmBuffer::~GbmBuffer() {
   if (bo())
     gbm_bo_destroy(bo());
 }
 
 // static
 scoped_refptr<GbmBuffer> GbmBuffer::CreateBuffer(
     const scoped_refptr<GbmDevice>& gbm,
-    SurfaceFactoryOzone::BufferFormat format,
+    gfx::BufferFormat format,
     const gfx::Size& size,
-    SurfaceFactoryOzone::BufferUsage usage) {
+    gfx::BufferUsage usage) {
   TRACE_EVENT2("drm", "GbmBuffer::CreateBuffer", "device",
                gbm->device_path().value(), "size", size.ToString());
-  bool use_scanout = (usage == ui::SurfaceFactoryOzone::SCANOUT);
+  bool use_scanout = (usage == gfx::BufferUsage::SCANOUT);
   unsigned flags = GBM_BO_USE_RENDERING;
   if (use_scanout)
     flags |= GBM_BO_USE_SCANOUT;
   gbm_bo* bo = gbm_bo_create(gbm->device(), size.width(), size.height(),
                              GetGbmFormatFromBufferFormat(format), flags);
   if (!bo)
     return NULL;
 
   scoped_refptr<GbmBuffer> buffer(new GbmBuffer(gbm, bo, use_scanout));
   if (use_scanout && !buffer->GetFramebufferId())
@@ skipping 76 matching lines @@
 
   gfx::Size pixmap_size = buffer_->GetSize();
   // If the required size is not integer-sized, round it to the next integer.
   *required_size = gfx::ToCeiledSize(
       gfx::SizeF(display_bounds.width() / crop_rect.width(),
                  display_bounds.height() / crop_rect.height()));
   return pixmap_size != *required_size;
 }
 
 }  // namespace ui