4 files changed, 31 insertions, 7 deletions
diff --git a/src/core/ozone/gl_surface_egl_qt.cpp b/src/core/ozone/gl_surface_egl_qt.cpp
index 91402abfe..849f0ee4d 100644
--- a/src/core/ozone/gl_surface_egl_qt.cpp
+++ b/src/core/ozone/gl_surface_egl_qt.cpp
@@ -46,6 +46,7 @@
 
 #if !defined(OS_MAC)
 #include "ui/gl/egl_util.h"
+#include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_surface_egl.h"
 #include "ui/gl/init/gl_factory.h"
 
@@ -57,7 +58,7 @@
 
 using ui::GetLastEGLErrorString;
 
-namespace gl{
+namespace gl {
 
 bool GLSurfaceEGLQt::g_egl_surfaceless_context_supported = false;
 bool GLSurfaceEGLQt::s_initialized = false;
@@ -92,6 +93,7 @@ bool GLSurfaceEGLQt::InitializeOneOff()
         return false;
     }
 
+    g_client_extensions = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
     g_extensions = eglQueryString(g_display, EGL_EXTENSIONS);
     g_egl_surfaceless_context_supported = ExtensionsContain(g_extensions, "EGL_KHR_surfaceless_context");
     if (g_egl_surfaceless_context_supported) {
@@ -186,6 +188,11 @@ bool GLSurfaceEGL::IsANGLEPowerPreferenceSupported()
     return false;
 }
 
+bool GLSurfaceEGL::IsANGLEExternalContextAndSurfaceSupported()
+{
+    return false;
+}
+
 bool GLSurfaceEGL::IsDisplaySemaphoreShareGroupSupported()
 {
     return false;
@@ -200,15 +207,26 @@ void GLSurfaceEGL::ShutdownOneOff()
 {
 }
 
-const char* GLSurfaceEGL::GetEGLExtensions()
+const char *GLSurfaceEGL::GetEGLClientExtensions()
+{
+    return GLSurfaceQt::g_client_extensions;
+}
+
+const char *GLSurfaceEGL::GetEGLExtensions()
 {
     return GLSurfaceQt::g_extensions;
 }
 
-bool GLSurfaceEGL::HasEGLExtension(const char* name)
+bool GLSurfaceEGL::HasEGLClientExtension(const char *name)
+{
+    return ExtensionsContain(GetEGLClientExtensions(), name);
+}
+
+bool GLSurfaceEGL::HasEGLExtension(const char *name)
 {
     return ExtensionsContain(GetEGLExtensions(), name);
 }
+
 bool GLSurfaceEGL::InitializeOneOff(gl::EGLDisplayPlatform /*native_display*/)
 {
     return GLSurfaceEGLQt::InitializeOneOff();
diff --git a/src/core/ozone/gl_surface_qt.cpp b/src/core/ozone/gl_surface_qt.cpp
index 3fb4746f4..8af3bd3c1 100644
--- a/src/core/ozone/gl_surface_qt.cpp
+++ b/src/core/ozone/gl_surface_qt.cpp
@@ -62,9 +62,10 @@
 
 namespace gl {
 
-void* GLSurfaceQt::g_display = nullptr;
-void* GLSurfaceQt::g_config = nullptr;
-const char* GLSurfaceQt::g_extensions = nullptr;
+void *GLSurfaceQt::g_display = nullptr;
+void *GLSurfaceQt::g_config = nullptr;
+const char *GLSurfaceQt::g_client_extensions = nullptr;
+const char *GLSurfaceQt::g_extensions = nullptr;
 
 GLSurfaceQt::~GLSurfaceQt()
 {
@@ -237,6 +238,10 @@ UINT DirectCompositionSurfaceWin::GetOverlaySupportFlags(DXGI_FORMAT format)
 void DirectCompositionSurfaceWin::DisableDecodeSwapChain()
 {
 }
+
+void DirectCompositionSurfaceWin::DisableSoftwareOverlays()
+{
+}
 } // namespace gl
 #endif
 #endif // !defined(OS_MAC)
diff --git a/src/core/ozone/gl_surface_qt.h b/src/core/ozone/gl_surface_qt.h
index cbdc8876a..055b27875 100644
--- a/src/core/ozone/gl_surface_qt.h
+++ b/src/core/ozone/gl_surface_qt.h
@@ -72,6 +72,7 @@ public:
     static void* g_config;
     static void* g_display;
     static const char* g_extensions;
+    static const char* g_client_extensions;
 
 private:
     DISALLOW_COPY_AND_ASSIGN(GLSurfaceQt);
diff --git a/src/core/ozone/platform_window_qt.h b/src/core/ozone/platform_window_qt.h
index dbeb320ac..15c1c3faf 100644
--- a/src/core/ozone/platform_window_qt.h
+++ b/src/core/ozone/platform_window_qt.h
@@ -61,7 +61,7 @@ public:
     void Show(bool inactive = false) override { }
     void Hide() override { }
     void Close() override { }
-    bool IsVisible() const { return true; }
+    bool IsVisible() const override { return true; }
     void SetTitle(const base::string16&) override { }
     void SetCapture() override { }
     void ReleaseCapture() override { }