| 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 08ccec8218bd2feed0977d9921985ed75f813b97..b230e17d6a18677fef94490b07be891d0355706e 100644
|
| --- a/ui/ozone/public/surface_factory_ozone.h
|
| +++ b/ui/ozone/public/surface_factory_ozone.h
|
| @@ -19,7 +19,6 @@
|
| #include "ui/gfx/native_widget_types.h"
|
| #include "ui/gfx/overlay_transform.h"
|
| #include "ui/gl/gl_implementation.h"
|
| -#include "ui/gl/gl_surface.h"
|
| #include "ui/ozone/ozone_base_export.h"
|
| #include "ui/ozone/public/gl_ozone.h"
|
| #include "ui/ozone/public/native_pixmap.h"
|
| @@ -67,24 +66,6 @@ class OZONE_BASE_EXPORT SurfaceFactoryOzone {
|
| // GL implementation doesn't exist.
|
| virtual GLOzone* GetGLOzone(gl::GLImplementation implementation);
|
|
|
| - // DEPRECATED(kylechar): Implement GLOzoneEGL instead.
|
| - virtual intptr_t GetNativeDisplay();
|
| -
|
| - // DEPRECATED(kylechar): Implement GLOzone instead.
|
| - virtual scoped_refptr<gl::GLSurface> CreateViewGLSurface(
|
| - gl::GLImplementation implementation,
|
| - gfx::AcceleratedWidget widget);
|
| -
|
| - // DEPRECATED(kylechar): Implement GLOzone instead.
|
| - virtual scoped_refptr<gl::GLSurface> CreateSurfacelessViewGLSurface(
|
| - gl::GLImplementation implementation,
|
| - gfx::AcceleratedWidget widget);
|
| -
|
| - // DEPRECATED(kylechar): Implement GLOzone instead.
|
| - virtual scoped_refptr<gl::GLSurface> CreateOffscreenGLSurface(
|
| - gl::GLImplementation implementation,
|
| - const gfx::Size& size);
|
| -
|
| // Create SurfaceOzoneCanvas for the specified gfx::AcceleratedWidget.
|
| //
|
| // Note: The platform must support creation of SurfaceOzoneCanvas from the
|
| @@ -92,9 +73,6 @@ class OZONE_BASE_EXPORT SurfaceFactoryOzone {
|
| virtual std::unique_ptr<SurfaceOzoneCanvas> CreateCanvasForWidget(
|
| gfx::AcceleratedWidget widget);
|
|
|
| - // DEPRECATED(kylechar): Implement GLOzoneEGL instead.
|
| - virtual bool LoadEGLGLES2Bindings();
|
| -
|
| // Returns all scanout formats for |widget| representing a particular display
|
| // controller or default display controller for kNullAcceleratedWidget.
|
| virtual std::vector<gfx::BufferFormat> GetScanoutFormats(
|
|
|