summaryrefslogtreecommitdiffstats
path: root/src/core/web_engine_context.h
diff options
context:
space:
mode:
authorJüri Valdmann <juri.valdmann@qt.io>2020-06-26 13:24:01 +0200
committerJüri Valdmann <juri.valdmann@qt.io>2020-08-26 13:18:46 +0200
commit7aa99d8d5b0dbf024019e70bf39b7d15796e1080 (patch)
tree643f2eb8c185c06263f76f6119248d71dc2f43a9 /src/core/web_engine_context.h
parent6deddc5ecd6155c567aecd0338c53c63fa465bfd (diff)
Fix ScopedGLContextChecker with QTWEBENGINE_DISABLE_GPU_THREAD=1
The ScopedGLContextChecker, which deactivates the current QOpenGLContext when executing Chromium tasks, is currently enabled only if QOpenGLContext::supportsThreadedOpenGL() is false. But the gpu thread can nowadays be disabled also with an environment variable and ScopedGLContextChecker needs to take this into account. Change-Id: I012524538b49b033ed053dbc41ed4350db916542 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 5988cec1a1b59aa163042a419c4c2e978bb814bb)
Diffstat (limited to 'src/core/web_engine_context.h')
-rw-r--r--src/core/web_engine_context.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/web_engine_context.h b/src/core/web_engine_context.h
index 6cbd5c8e5..e2190f8a2 100644
--- a/src/core/web_engine_context.h
+++ b/src/core/web_engine_context.h
@@ -123,13 +123,15 @@ public:
static gpu::SyncPointManager *syncPointManager();
+ static bool isGpuServiceOnUIThread();
+
private:
friend class base::RefCounted<WebEngineContext>;
friend class ProfileAdapter;
WebEngineContext();
~WebEngineContext();
- static void registerMainThreadFactories(bool threaded);
+ static void registerMainThreadFactories();
static void destroyGpuProcess();
std::unique_ptr<base::RunLoop> m_runLoop;