Rewrite native context handling for QtShareGLContext

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

1 files changed, 1 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()
 {
 }