Use ozone for x11

Switch to use ozone also for x11/glx. This way we have a
more elegant approach to hook in our gl surface classes
and we use ozone for all linux qpa backends. Moreover,
we have now also more fine grain control to reimplement
gl surface handling logic.

This also aims to fix currently broken wayland backend,
but instead of patching the broken x11 calls, we simply reuse
ozone which does not use x11 for ozone egl.

Add webengine-x11 check to handle ozone glx plugin compilation.

For ozone egl backend reimplement missing functions.

Task-number: QTBUG-65682
Task-number: QTBUG-51631
Change-Id: I8b45c6f4d09a1c703efb12b6452d78ab385371ab
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>

1 files changed, 9 insertions, 11 deletions

diff --git a/src/core/ozone/gl_ozone_egl_qt.h b/src/core/ozone/gl_ozone_egl_qt.h
index fc609c51c..c24d03a81 100644
--- a/src/core/ozone/gl_ozone_egl_qt.h
+++ b/src/core/ozone/gl_ozone_egl_qt.h
@@ -44,18 +44,16 @@
 
 #include "ui/ozone/common/gl_ozone_egl.h"
 
-namespace QtWebEngineCore {
+namespace ui {
 
-class GLOzoneEGLQt : public ui::GLOzoneEGL {
+class GLOzoneEGLQt : public GLOzoneEGL {
 public:
-    scoped_refptr<gl::GLSurface> CreateViewGLSurface(gfx::AcceleratedWidget /*window*/) override
-    {
-        return nullptr;
-    }
-    scoped_refptr<gl::GLSurface> CreateOffscreenGLSurface(const gfx::Size& /*size*/) override
-    {
-        return nullptr;
-    }
+    bool InitializeGLOneOffPlatform() override;
+    bool InitializeExtensionSettingsOneOffPlatform() override;
+    scoped_refptr<gl::GLSurface> CreateViewGLSurface(
+            gfx::AcceleratedWidget window) override;
+    scoped_refptr<gl::GLSurface> CreateOffscreenGLSurface(
+            const gfx::Size& size) override;
 
 protected:
     // Returns native platform display handle. This is used to obtain the EGL
@@ -66,7 +64,7 @@ protected:
     bool LoadGLES2Bindings(gl::GLImplementation implementation) override;
 };
 
-} // namespace QtWebEngineCore
+} // namespace ui
 
 #endif // defined(USE_OZONE)