Adaptations for Chromium 91

Change-Id: Ie0236697615fd67e4f53df3dca013ce39628cc29
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

8 files changed, 13 insertions, 7 deletions

diff --git a/src/core/ozone/gl_ozone_egl_qt.cpp b/src/core/ozone/gl_ozone_egl_qt.cpp
index 14ba5e8d9..2b28e29ce 100644
--- a/src/core/ozone/gl_ozone_egl_qt.cpp
+++ b/src/core/ozone/gl_ozone_egl_qt.cpp
@@ -65,7 +65,7 @@ base::NativeLibrary LoadLibrary(const base::FilePath& filename) {
     return library;
 }
 
-bool GLOzoneEGLQt::LoadGLES2Bindings(gl::GLImplementation /*implementation*/)
+bool GLOzoneEGLQt::LoadGLES2Bindings(const gl::GLImplementationParts & /*implementation*/)
 {
     base::NativeLibrary eglgles2Library = dlopen(NULL, RTLD_LAZY);
     if (!eglgles2Library) {
diff --git a/src/core/ozone/gl_ozone_egl_qt.h b/src/core/ozone/gl_ozone_egl_qt.h
index c55ba232c..c2515a416 100644
--- a/src/core/ozone/gl_ozone_egl_qt.h
+++ b/src/core/ozone/gl_ozone_egl_qt.h
@@ -61,7 +61,7 @@ protected:
     gl::EGLDisplayPlatform GetNativeDisplay() override;
 
     // Sets up GL bindings for the native surface.
-    bool LoadGLES2Bindings(gl::GLImplementation implementation) override;
+    bool LoadGLES2Bindings(const gl::GLImplementationParts &implementation) override;
 };
 
 } // namespace ui
diff --git a/src/core/ozone/gl_ozone_glx_qt.cpp b/src/core/ozone/gl_ozone_glx_qt.cpp
index 60b970209..19c24dcb6 100644
--- a/src/core/ozone/gl_ozone_glx_qt.cpp
+++ b/src/core/ozone/gl_ozone_glx_qt.cpp
@@ -61,7 +61,8 @@ bool GLOzoneGLXQt::InitializeGLOneOffPlatform() {
 }
 
 bool GLOzoneGLXQt::InitializeStaticGLBindings(
-        gl::GLImplementation implementation) {
+        const gl::GLImplementationParts &implementation) {
+    Q_UNUSED(implementation);
 
     base::NativeLibrary library = dlopen(NULL, RTLD_LAZY);
     if (!library) {
diff --git a/src/core/ozone/gl_ozone_glx_qt.h b/src/core/ozone/gl_ozone_glx_qt.h
index 7825cba35..f1bf8ac61 100644
--- a/src/core/ozone/gl_ozone_glx_qt.h
+++ b/src/core/ozone/gl_ozone_glx_qt.h
@@ -53,7 +53,7 @@ public:
     ~GLOzoneGLXQt() override {}
 
     bool InitializeGLOneOffPlatform() override;
-    bool InitializeStaticGLBindings(gl::GLImplementation implementation) override;
+    bool InitializeStaticGLBindings(const gl::GLImplementationParts &implementation) override;
     bool InitializeExtensionSettingsOneOffPlatform() override;
     void ShutdownGL() override;
     void SetDisabledExtensionsPlatform(
diff --git a/src/core/ozone/gl_surface_egl_qt.cpp b/src/core/ozone/gl_surface_egl_qt.cpp
index 849f0ee4d..8c8ae98a7 100644
--- a/src/core/ozone/gl_surface_egl_qt.cpp
+++ b/src/core/ozone/gl_surface_egl_qt.cpp
@@ -237,6 +237,11 @@ bool GLSurfaceEGL::IsAndroidNativeFenceSyncSupported()
      return false;
 }
 
+DisplayType GLSurfaceEGL::GetDisplayType()
+{
+     return DisplayType::DEFAULT;
+}
+
 GLSurfaceEGLQt::GLSurfaceEGLQt(const gfx::Size& size)
     : GLSurfaceQt(size),
       m_surfaceBuffer(0)
diff --git a/src/core/ozone/platform_window_qt.h b/src/core/ozone/platform_window_qt.h
index 15c1c3faf..c0dc8ccc3 100644
--- a/src/core/ozone/platform_window_qt.h
+++ b/src/core/ozone/platform_window_qt.h
@@ -62,7 +62,7 @@ public:
     void Hide() override { }
     void Close() override { }
     bool IsVisible() const override { return true; }
-    void SetTitle(const base::string16&) override { }
+    void SetTitle(const std::u16string&) override { }
     void SetCapture() override { }
     void ReleaseCapture() override { }
     bool HasCapture() const override { return false; }
diff --git a/src/core/ozone/surface_factory_qt.cpp b/src/core/ozone/surface_factory_qt.cpp
index 846d930d6..e2ffabe0e 100644
--- a/src/core/ozone/surface_factory_qt.cpp
+++ b/src/core/ozone/surface_factory_qt.cpp
@@ -69,7 +69,7 @@ std::vector<gl::GLImplementation> SurfaceFactoryQt::GetAllowedGLImplementations(
     return m_impl;
 }
 
-ui::GLOzone* SurfaceFactoryQt::GetGLOzone(gl::GLImplementation implementation)
+ui::GLOzone *SurfaceFactoryQt::GetGLOzone(const gl::GLImplementationParts &implementation)
 {
     return m_ozone.get();
 }
diff --git a/src/core/ozone/surface_factory_qt.h b/src/core/ozone/surface_factory_qt.h
index 232f11e0f..fa8331a78 100644
--- a/src/core/ozone/surface_factory_qt.h
+++ b/src/core/ozone/surface_factory_qt.h
@@ -51,7 +51,7 @@ class SurfaceFactoryQt : public ui::SurfaceFactoryOzone
 public:
     SurfaceFactoryQt();
     std::vector<gl::GLImplementation> GetAllowedGLImplementations() override;
-    ui::GLOzone* GetGLOzone(gl::GLImplementation implementation) override;
+    ui::GLOzone *GetGLOzone(const gl::GLImplementationParts &implementation) override;
 private:
     std::vector<gl::GLImplementation> m_impl;
     std::unique_ptr<ui::GLOzone> m_ozone;