| Index: ui/ozone/public/surface_factory_ozone.h
|
| diff --git a/ui/ozone/public/surface_factory_ozone.h b/ui/ozone/public/surface_factory_ozone.h
|
| index 4dc5572ad3c34cbbaf8539c7574878a8bc03da11..9e9bf46f8f99af72946fd664052afe5a95b11265 100644
|
| --- a/ui/ozone/public/surface_factory_ozone.h
|
| +++ b/ui/ozone/public/surface_factory_ozone.h
|
| @@ -12,6 +12,7 @@
|
| #include "ui/gfx/native_widget_types.h"
|
| #include "ui/gfx/overlay_transform.h"
|
| #include "ui/ozone/ozone_base_export.h"
|
| +#include "ui/ozone/public/pixmap_types.h"
|
|
|
| namespace ui {
|
|
|
| @@ -52,22 +53,6 @@ class SurfaceOzoneEGL;
|
| // 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)>
|
| @@ -118,18 +103,14 @@ class OZONE_BASE_EXPORT SurfaceFactoryOzone {
|
| virtual scoped_refptr<NativePixmap> CreateNativePixmap(
|
| gfx::AcceleratedWidget widget,
|
| gfx::Size size,
|
| - BufferFormat format,
|
| - BufferUsage usage);
|
| + PixmapFormat format,
|
| + PixmapUsage 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);
|
| -
|
| protected:
|
| SurfaceFactoryOzone();
|
| virtual ~SurfaceFactoryOzone();
|
|
|