diff options
Diffstat (limited to 'src/core/api/qtwebenginecoreglobal.cpp')
| -rw-r--r-- | src/core/api/qtwebenginecoreglobal.cpp | 189 |
1 files changed, 96 insertions, 93 deletions
diff --git a/src/core/api/qtwebenginecoreglobal.cpp b/src/core/api/qtwebenginecoreglobal.cpp index ce4362741..d5112ccb3 100644 --- a/src/core/api/qtwebenginecoreglobal.cpp +++ b/src/core/api/qtwebenginecoreglobal.cpp @@ -1,81 +1,31 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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$ -** -****************************************************************************/ +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtwebenginecoreglobal_p.h" #include <QGuiApplication> #if QT_CONFIG(opengl) # include <QOpenGLContext> -#ifdef Q_OS_MACOS -#include <sys/types.h> -#include <sys/sysctl.h> -#endif #endif #include <QThread> +#include <QQuickWindow> +#include "web_engine_context.h" +#include "web_engine_library_info.h" -#if QT_CONFIG(opengl) +#include "base/base_paths.h" +#include "base/i18n/icu_util.h" +#include "base/path_service.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" + +#if QT_CONFIG(opengl) && !defined(Q_OS_MACOS) QT_BEGIN_NAMESPACE Q_GUI_EXPORT void qt_gl_set_global_share_context(QOpenGLContext *context); Q_GUI_EXPORT QOpenGLContext *qt_gl_global_share_context(); QT_END_NAMESPACE #endif -#if QT_CONFIG(opengl) -#ifdef Q_OS_MACOS -static bool needsOfflineRendererWorkaround() -{ - size_t hwmodelsize = 0; - - if (sysctlbyname("hw.model", nullptr, &hwmodelsize, nullptr, 0) == -1) - return false; - - char hwmodel[hwmodelsize]; - if (sysctlbyname("hw.model", &hwmodel, &hwmodelsize, nullptr, 0) == -1) - return false; - - return QString::fromLatin1(hwmodel) == QLatin1String("MacPro6,1"); -} -#endif -#endif - namespace QtWebEngineCore { -#if QT_CONFIG(opengl) +#if QT_CONFIG(opengl) && !defined(Q_OS_MACOS) static QOpenGLContext *shareContext; static void deleteShareContext() @@ -88,52 +38,105 @@ static void deleteShareContext() #endif // ### Qt 6: unify this logic and Qt::AA_ShareOpenGLContexts. -// QtWebEngine::initialize was introduced first and meant to be called +// QtWebEngineQuick::initialize was introduced first and meant to be called // after the QGuiApplication creation, when AA_ShareOpenGLContexts fills // the same need but the flag has to be set earlier. -Q_WEBENGINECORE_PRIVATE_EXPORT void initialize() +Q_WEBENGINECORE_EXPORT void initialize() { -#if QT_CONFIG(opengl) +#if QT_CONFIG(opengl) && !defined(Q_OS_MACOS) #ifdef Q_OS_WIN32 qputenv("QT_D3DCREATE_MULTITHREADED", "1"); #endif -#ifdef Q_OS_MACOS - if (needsOfflineRendererWorkaround()) - qputenv("QT_MAC_PRO_WEBENGINE_WORKAROUND", "1"); + auto api = QQuickWindow::graphicsApi(); + if (api != QSGRendererInterface::OpenGL +#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0) + && api != QSGRendererInterface::Vulkan && api != QSGRendererInterface::Metal + && api != QSGRendererInterface::Direct3D11 #endif + ) + QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGL); // No need to override the shared context if QApplication already set one (e.g with Qt::AA_ShareOpenGLContexts). - if (qt_gl_global_share_context()) - return; + if (!qt_gl_global_share_context()) { - QCoreApplication *app = QCoreApplication::instance(); - if (!app) { - qFatal("QtWebEngine::initialize() but no core application instance."); - return; - } + QCoreApplication *app = QCoreApplication::instance(); + if (!app) { + qFatal("QtWebEngineQuick::initialize() but no core application instance."); + return; + } - // Bail out silently if the user did not construct a QGuiApplication. - if (!qobject_cast<QGuiApplication *>(app)) - return; + // Bail out silently if the user did not construct a QGuiApplication. + if (!qobject_cast<QGuiApplication *>(app)) + return; - if (app->thread() != QThread::currentThread()) { - qFatal("QtWebEngine::initialize() must be called from the Qt gui thread."); - return; + if (app->thread() != QThread::currentThread()) { + qFatal("QtWebEngineQuick::initialize() must be called from the Qt gui thread."); + return; + } + + if (shareContext) + return; + + shareContext = new QOpenGLContext; + QSurfaceFormat format = QSurfaceFormat::defaultFormat(); + + shareContext->setFormat(format); + shareContext->create(); + qAddPostRoutine(deleteShareContext); + qt_gl_set_global_share_context(shareContext); + + // Classes like QOpenGLWidget check for the attribute + app->setAttribute(Qt::AA_ShareOpenGLContexts); } - if (shareContext) - return; +#endif // QT_CONFIG(opengl) && !defined(Q_OS_MACOS) +} - shareContext = new QOpenGLContext; - QSurfaceFormat format = QSurfaceFormat::defaultFormat(); -// format.setOption(QSurfaceFormat::ResetNotification); - shareContext->setFormat(format); - shareContext->create(); - qAddPostRoutine(deleteShareContext); - qt_gl_set_global_share_context(shareContext); +bool closingDown() +{ + return WebEngineContext::closingDown(); +} - // Classes like QOpenGLWidget check for the attribute - app->setAttribute(Qt::AA_ShareOpenGLContexts); +} // namespace QtWebEngineCore + +#if defined(Q_OS_WIN) +namespace QtWebEngineSandbox { +sandbox::SandboxInterfaceInfo *staticSandboxInterfaceInfo(sandbox::SandboxInterfaceInfo *info) +{ + static sandbox::SandboxInterfaceInfo *g_info = nullptr; + if (info) { + Q_ASSERT(g_info == nullptr); + g_info = info; + } + return g_info; +} +} //namespace +#endif +static void initialize() +{ +#if QT_CONFIG(opengl) && !defined(Q_OS_MACOS) + // QCoreApplication is not yet instantiated, ensuring the call will be deferred + qAddPreRoutine(QtWebEngineCore::initialize); #endif // QT_CONFIG(opengl) } -} // namespace QtWebEngineCore + +QT_BEGIN_NAMESPACE + +QString qWebEngineGetDomainAndRegistry(const QUrl &url) { + base::FilePath icuDataPath; + // Let's assume that ICU is already initialized if DIR_QT_LIBRARY_DATA is set. + if (!base::PathService::Get(base::DIR_QT_LIBRARY_DATA, &icuDataPath)) { + icuDataPath = WebEngineLibraryInfo::getPath(base::DIR_QT_LIBRARY_DATA); + if (!base::PathService::OverrideAndCreateIfNeeded(base::DIR_QT_LIBRARY_DATA, icuDataPath, false, false)) + qWarning("Failed to set ICU data path."); + base::i18n::InitializeICU(); + } + + const QString host = url.host(); + const std::string domain = net::registry_controlled_domains::GetDomainAndRegistry(host.toStdString(), net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES); + return QString::fromStdString(domain); +} + +QT_END_NAMESPACE + +Q_CONSTRUCTOR_FUNCTION(initialize) |