Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

ui/ozone/public/surface_factory_ozone.h

 // Copyright (c) 2013 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.
 
 #ifndef UI_OZONE_PUBLIC_SURFACE_FACTORY_OZONE_H_
 #define UI_OZONE_PUBLIC_SURFACE_FACTORY_OZONE_H_
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/native_library.h"
+#include "ui/gfx/buffer_types.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/overlay_transform.h"
 #include "ui/ozone/ozone_base_export.h"
 
 namespace ui {
 
 class NativePixmap;
 class SurfaceOzoneCanvas;
 class SurfaceOzoneEGL;
@@ skipping 24 matching lines @@
 // The following function is specific to the software path:
 //  - CreateCanvasForWidget
 //
 // The accelerated path can optionally provide support for the software drawing
 // path.
 //
 // The remaining functions are not covered since they are needed in both drawing
 // modes (See comments bellow for descriptions).
 class OZONE_BASE_EXPORT SurfaceFactoryOzone {
  public:
-  // Describes overlay buffer format.
-  // TODO: this is a placeholder for now and will be populated with more
-  // formats once we know what sorts of content, video, etc. we can support.
-  enum BufferFormat {
-    UNKNOWN,
-    BGRA_8888,
-    RGBX_8888,
-    BUFFER_FORMAT_LAST = RGBX_8888
-  };
-
-  enum BufferUsage {
-    MAP,
-    PERSISTENT_MAP,
-    SCANOUT,
-  };
-
   typedef void* (*GLGetProcAddressProc)(const char* name);
   typedef base::Callback<void(base::NativeLibrary)> AddGLLibraryCallback;
   typedef base::Callback<void(GLGetProcAddressProc)>
       SetGLGetProcAddressProcCallback;
 
   // Returns native platform display handle. This is used to obtain the EGL
   // display connection for the native display.
   virtual intptr_t GetNativeDisplay();
 
   // Create SurfaceOzoneEGL for the specified gfx::AcceleratedWidget.
@@ skipping 30 matching lines @@
   // caller. desired_list contains list of desired EGL properties and values.
   virtual const int32* GetEGLSurfaceProperties(const int32* desired_list);
 
   // Create a single native buffer to be used for overlay planes or zero copy
   // for |widget| representing a particular display controller or default
   // display controller for kNullAcceleratedWidget.
   // It can be called on any thread.
   virtual scoped_refptr<NativePixmap> CreateNativePixmap(
       gfx::AcceleratedWidget widget,
       gfx::Size size,
-      BufferFormat format,
-      BufferUsage usage);
+      gfx::BufferFormat format,
+      gfx::BufferUsage usage);
 
   // Returns true if overlays can be shown at z-index 0, replacing the main
   // surface. Combined with surfaceless extensions, it allows for an
   // overlay-only mode.
   virtual bool CanShowPrimaryPlaneAsOverlay();
 
   // Returns true if the platform is able to create buffers for a specific usage
   // such as MAP for zero copy or SCANOUT for display controller.
-  virtual bool CanCreateNativePixmap(BufferUsage usage);
+  virtual bool CanCreateNativePixmap(gfx::BufferUsage usage);
 
  protected:
   SurfaceFactoryOzone();
   virtual ~SurfaceFactoryOzone();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SurfaceFactoryOzone);
 };
 
 }  // namespace ui
 
 #endif  // UI_OZONE_PUBLIC_SURFACE_FACTORY_OZONE_H_