diff options
Diffstat (limited to 'src/core/web_engine_context.h')
| -rw-r--r-- | src/core/web_engine_context.h | 56 |
1 files changed, 6 insertions, 50 deletions
diff --git a/src/core/web_engine_context.h b/src/core/web_engine_context.h index accfa34e1..50b080db1 100644 --- a/src/core/web_engine_context.h +++ b/src/core/web_engine_context.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** 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) 2016 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 #ifndef WEB_ENGINE_CONTEXT_H #define WEB_ENGINE_CONTEXT_H @@ -57,11 +21,9 @@ class CommandLine; namespace content { class BrowserMainRunner; class ContentMainRunner; -class GpuProcess; class GpuThreadController; class InProcessChildThreadParams; class MojoIpcSupport; -struct StartupData; } namespace discardable_memory { @@ -70,7 +32,6 @@ class DiscardableSharedMemoryManager; namespace gpu { struct GpuPreferences; -class SyncPointManager; } #if QT_CONFIG(webengine_printing_and_pdf) @@ -105,7 +66,7 @@ public: static void destroyContextPostRoutine(); static ProxyAuthentication qProxyNetworkAuthentication(QString host, int port); static void flushMessages(); - + static bool closingDown(); ProfileAdapter *createDefaultProfileAdapter(); ProfileAdapter *defaultProfileAdapter(); @@ -120,11 +81,8 @@ public: void addProfileAdapter(ProfileAdapter *profileAdapter); void removeProfileAdapter(ProfileAdapter *profileAdapter); void destroy(); - static base::CommandLine* commandLine(); - - static gpu::SyncPointManager *syncPointManager(); - - static bool isGpuServiceOnUIThread(); + static base::CommandLine *initCommandLine(bool &useEmbeddedSwitches, + bool &enableGLSoftwareRendering); private: friend class base::RefCounted<WebEngineContext>; @@ -133,14 +91,12 @@ private: ~WebEngineContext(); static void registerMainThreadFactories(); - static void destroyGpuProcess(); std::unique_ptr<base::RunLoop> m_runLoop; std::unique_ptr<ContentMainDelegateQt> m_mainDelegate; std::unique_ptr<content::ContentMainRunner> m_contentRunner; std::unique_ptr<content::BrowserMainRunner> m_browserRunner; std::unique_ptr<discardable_memory::DiscardableSharedMemoryManager> m_discardableSharedMemoryManager; - std::unique_ptr<content::StartupData> m_startupData; std::unique_ptr<content::MojoIpcSupport> m_mojoIpcSupport; std::unique_ptr<QObject> m_globalQObject; std::unique_ptr<ProfileAdapter> m_defaultProfileAdapter; @@ -158,7 +114,7 @@ private: #endif static scoped_refptr<QtWebEngineCore::WebEngineContext> m_handle; static bool m_destroyed; - static QAtomicPointer<gpu::SyncPointManager> s_syncPointManager; + static bool m_closingDown; }; } // namespace |