Rewrite native context handling for QtShareGLContext

Change-Id: Ie880978f2122528789d7ec23b24bb8259eee0fb8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

4 files changed, 207 insertions, 101 deletions

diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index c8d34ae73..32013849b 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -103,10 +103,6 @@
 #include "third_party/blink/public/mojom/insecure_input/insecure_input_service.mojom.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches.h"
-#include "ui/gl/gl_context.h"
-#include "ui/gl/gl_implementation.h"
-#include "ui/gl/gl_share_group.h"
-#include "ui/gl/gpu_timing.h"
 #include "url/url_util_qt.h"
 
 #include "qtwebengine/common/renderer_configuration.mojom.h"
@@ -145,7 +141,7 @@
 #include "api/qwebenginecookiestore.h"
 #include "api/qwebenginecookiestore_p.h"
 #include "api/qwebengineurlscheme.h"
-
+#include "ozone/gl_share_context_qt.h"
 #if defined(Q_OS_LINUX)
 #include "global_descriptors_qt.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -186,15 +182,6 @@
 #include <QGuiApplication>
 #include <QLocale>
 #include <QStandardPaths>
-#if QT_CONFIG(opengl)
-# include <QOpenGLContext>
-# include <QOpenGLExtraFunctions>
-#endif
-#include <qpa/qplatformnativeinterface.h>
-
-QT_BEGIN_NAMESPACE
-Q_GUI_EXPORT QOpenGLContext *qt_gl_global_share_context();
-QT_END_NAMESPACE
 
 // Implement IsHandledProtocol as declared in //url/url_util_qt.h.
 namespace url {
@@ -235,93 +222,6 @@ bool IsHandledProtocol(base::StringPiece scheme)
 
 namespace QtWebEngineCore {
 
-class QtShareGLContext : public gl::GLContext {
-public:
-    QtShareGLContext(QOpenGLContext *qtContext)
-        : gl::GLContext(0)
-        , m_handle(0)
-    {
-        QString platform = qApp->platformName().toLower();
-        QPlatformNativeInterface *pni = QGuiApplication::platformNativeInterface();
-        if (platform == QLatin1String("xcb") || platform == QLatin1String("offscreen")) {
-            if (gl::GetGLImplementation() == gl::kGLImplementationEGLGLES2)
-                m_handle = pni->nativeResourceForContext(QByteArrayLiteral("eglcontext"), qtContext);
-            else
-                m_handle = pni->nativeResourceForContext(QByteArrayLiteral("glxcontext"), qtContext);
-        } else if (platform == QLatin1String("cocoa"))
-            m_handle = pni->nativeResourceForContext(QByteArrayLiteral("cglcontextobj"), qtContext);
-        else if (platform == QLatin1String("qnx"))
-            m_handle = pni->nativeResourceForContext(QByteArrayLiteral("eglcontext"), qtContext);
-        else if (platform == QLatin1String("eglfs") || platform == QLatin1String("wayland")
-                 || platform == QLatin1String("wayland-egl"))
-            m_handle = pni->nativeResourceForContext(QByteArrayLiteral("eglcontext"), qtContext);
-        else if (platform == QLatin1String("windows")) {
-            if (gl::GetGLImplementation() == gl::kGLImplementationEGLGLES2)
-                m_handle = pni->nativeResourceForContext(QByteArrayLiteral("eglContext"), qtContext);
-            else
-                m_handle = pni->nativeResourceForContext(QByteArrayLiteral("renderingcontext"), qtContext);
-        } else {
-            qFatal("%s platform not yet supported", platform.toLatin1().constData());
-            // Add missing platforms once they work.
-            Q_UNREACHABLE();
-        }
-    }
-
-    void* GetHandle() override { return m_handle; }
-    unsigned int CheckStickyGraphicsResetStatus() override
-    {
-#if QT_CONFIG(opengl)
-        if (QOpenGLContext *context = qt_gl_global_share_context()) {
-            if (context->format().testOption(QSurfaceFormat::ResetNotification))
-                return context->extraFunctions()->glGetGraphicsResetStatus();
-        }
-#endif
-        return 0 /*GL_NO_ERROR*/;
-    }
-
-    // We don't care about the rest, this context shouldn't be used except for its handle.
-    bool Initialize(gl::GLSurface *, const gl::GLContextAttribs &) override { Q_UNREACHABLE(); return false; }
-    bool MakeCurrent(gl::GLSurface *) override { Q_UNREACHABLE(); return false; }
-    void ReleaseCurrent(gl::GLSurface *) override { Q_UNREACHABLE(); }
-    bool IsCurrent(gl::GLSurface *) override { Q_UNREACHABLE(); return false; }
-    scoped_refptr<gl::GPUTimingClient> CreateGPUTimingClient() override
-    {
-        return nullptr;
-    }
-    const gfx::ExtensionSet& GetExtensions() override
-    {
-        static const gfx::ExtensionSet s_emptySet;
-        return s_emptySet;
-    }
-    void ResetExtensions() override
-    {
-    }
-
-private:
-    void *m_handle;
-};
-
-class ShareGroupQt : public gl::GLShareGroup {
-public:
-    gl::GLContext* GetContext() override { return m_shareContextQt.get(); }
-    void AboutToAddFirstContext() override;
-
-private:
-    scoped_refptr<QtShareGLContext> m_shareContextQt;
-};
-
-void ShareGroupQt::AboutToAddFirstContext()
-{
-#if QT_CONFIG(opengl)
-    // This currently has to be setup by ::main in all applications using QQuickWebEngineView with delegated rendering.
-    QOpenGLContext *shareContext = qt_gl_global_share_context();
-    if (!shareContext) {
-        qFatal("QWebEngine: OpenGL resource sharing is not set up in QtQuick. Please make sure to call QtWebEngine::initialize() in your main() function before QCoreApplication is created.");
-    }
-    m_shareContextQt = new QtShareGLContext(shareContext);
-#endif
-}
-
 ContentBrowserClientQt::ContentBrowserClientQt()
 {
 }
diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri
index 60cc104cf..46ac5c8d2 100644
--- a/src/core/core_chromium.pri
+++ b/src/core/core_chromium.pri
@@ -89,6 +89,7 @@ SOURCES = \
         net/url_request_custom_job_proxy.cpp \
         net/webui_controller_factory_qt.cpp \
         ozone/gl_context_qt.cpp \
+        ozone/gl_share_context_qt.cpp \
         ozone/gl_ozone_egl_qt.cpp \
         ozone/gl_surface_qt.cpp \
         ozone/gl_surface_egl_qt.cpp \
@@ -191,6 +192,7 @@ HEADERS = \
         net/url_request_custom_job_proxy.h \
         net/webui_controller_factory_qt.h \
         ozone/gl_context_qt.h \
+        ozone/gl_share_context_qt.h \
         ozone/gl_ozone_egl_qt.h \
         ozone/gl_surface_qt.h \
         ozone/gl_surface_egl_qt.h \
diff --git a/src/core/ozone/gl_share_context_qt.cpp b/src/core/ozone/gl_share_context_qt.cpp
new file mode 100644
index 000000000..dbfb7848f
--- /dev/null
+++ b/src/core/ozone/gl_share_context_qt.cpp
@@ -0,0 +1,105 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "gl_share_context_qt.h"
+#include <QtGui/qtgui-config.h>
+#include <qpa/qplatformnativeinterface.h>
+#include <QtGui/qopenglcontext_platform.h>
+#if QT_CONFIG(opengl)
+#include <QOpenGLContext>
+#include <QOpenGLExtraFunctions>
+#endif
+
+namespace QtWebEngineCore {
+
+QtShareGLContext::QtShareGLContext(QOpenGLContext *qtContext)
+    : gl::GLContext(nullptr), m_handle(nullptr)
+{
+#if QT_CONFIG(opengl)
+    QOpenGLContext *context = QOpenGLContext::globalShareContext();
+#if defined(Q_OS_MACOS)
+    auto *ctx = context->platformInterface<QPlatformInterface::QCocoaGLContext>();
+#endif
+#if defined(Q_OS_WIN)
+    auto *ctx = context->platformInterface<QPlatformInterface::QWGLContext>();
+#endif
+#if defined(Q_OS_LINUX)
+    auto *ctx = context->platformInterface<QPlatformInterface::QGLXContext>();
+#endif
+    if (ctx)
+        m_handle = (void *)ctx->nativeContext();
+#if QT_CONFIG(egl)
+    if (!m_handle) {
+        auto *ctx = context->platformInterface<QPlatformInterface::QEGLContext>();
+        if (ctx)
+            m_handle = (void *)ctx->nativeContext();
+    }
+#endif
+    if (!m_handle)
+        qFatal("Could not get handle for shared contex");
+#endif // QT_CONFIG(opengl)
+}
+
+unsigned int QtShareGLContext::CheckStickyGraphicsResetStatus()
+{
+#if QT_CONFIG(opengl)
+    if (QOpenGLContext *context = QOpenGLContext::globalShareContext()) {
+        if (context->format().testOption(QSurfaceFormat::ResetNotification))
+            return context->extraFunctions()->glGetGraphicsResetStatus();
+    }
+#endif
+    return 0 /*GL_NO_ERROR*/;
+}
+
+void ShareGroupQt::AboutToAddFirstContext()
+{
+#if QT_CONFIG(opengl)
+    // This currently has to be setup by ::main in all applications using QQuickWebEngineView with
+    // delegated rendering.
+    QOpenGLContext *shareContext = QOpenGLContext::globalShareContext();
+    if (!shareContext) {
+        qFatal("QWebEngine: OpenGL resource sharing is not set up in QtQuick. Please make sure to "
+               "call QtWebEngine::initialize() in your main() function before QCoreApplication is "
+               "created.");
+    }
+    m_shareContextQt = new QtShareGLContext(shareContext);
+#endif
+}
+
+} // namespace
diff --git a/src/core/ozone/gl_share_context_qt.h b/src/core/ozone/gl_share_context_qt.h
new file mode 100644
index 000000000..26e884e10
--- /dev/null
+++ b/src/core/ozone/gl_share_context_qt.h
@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GL_SHARE_CONTEXT_QT
+#define GL_SHARE_CONTEXT_QT
+
+#include "ui/gl/gpu_timing.h"
+#include "ui/gl/gl_context.h"
+#include "ui/gl/gl_share_group.h"
+#include "qtwebenginecoreglobal.h"
+
+QT_FORWARD_DECLARE_CLASS(QOpenGLContext)
+
+namespace QtWebEngineCore {
+
+class QtShareGLContext : public gl::GLContext
+{
+
+public:
+    QtShareGLContext(QOpenGLContext *qtContext);
+    void *GetHandle() override { return m_handle; }
+    unsigned int CheckStickyGraphicsResetStatus() override;
+    // We don't care about the rest, this context shouldn't be used except for its handle.
+    bool Initialize(gl::GLSurface *, const gl::GLContextAttribs &) override
+    {
+        Q_UNREACHABLE();
+        return false;
+    }
+    bool MakeCurrent(gl::GLSurface *) override
+    {
+        Q_UNREACHABLE();
+        return false;
+    }
+    void ReleaseCurrent(gl::GLSurface *) override { Q_UNREACHABLE(); }
+    bool IsCurrent(gl::GLSurface *) override
+    {
+        Q_UNREACHABLE();
+        return false;
+    }
+    scoped_refptr<gl::GPUTimingClient> CreateGPUTimingClient() override { return nullptr; }
+    const gfx::ExtensionSet &GetExtensions() override
+    {
+        static const gfx::ExtensionSet s_emptySet;
+        return s_emptySet;
+    }
+    void ResetExtensions() override {}
+
+private:
+    void *m_handle;
+};
+
+class ShareGroupQt : public gl::GLShareGroup
+{
+
+public:
+    gl::GLContext *GetContext() override { return m_shareContextQt.get(); }
+    void AboutToAddFirstContext() override;
+
+private:
+    scoped_refptr<QtShareGLContext> m_shareContextQt;
+};
+} // namespace
+#endif