diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2020-02-10 14:05:06 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-02-11 12:38:23 +0100 |
| commit | c3dcc07f4f3f94ed510dc4bc646e0a897cc57860 (patch) | |
| tree | 3133447902210156cf194d1c5d545c1c52f2c34a | |
| parent | d6d89a179a397c09aaf98e966b95ec7dabd28626 (diff) | |
| download | qtwebengine-chromium-c3dcc07f4f3f94ed510dc4bc646e0a897cc57860.tar.gz | |
Don't force gpu process launch on macOS with vizdc and no GL
Turns out Chromium on macOS expects vizdc to run inside the GPU process. In
fact, Chromium attempts to launch a GPU process even with --disable-gpu, because
GpuDataManager::GpuProcessStartAllowed returns true whenever vizdc is enabled.
Change-Id: I2f31ad8accfb418446fc242ed00ebf1f6accd6fd
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/content/browser/gpu/gpu_data_manager_impl_private.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chromium/content/browser/gpu/gpu_data_manager_impl_private.cc b/chromium/content/browser/gpu/gpu_data_manager_impl_private.cc index 610171043a4..19861f2f367 100644 --- a/chromium/content/browser/gpu/gpu_data_manager_impl_private.cc +++ b/chromium/content/browser/gpu/gpu_data_manager_impl_private.cc @@ -369,6 +369,7 @@ bool GpuDataManagerImplPrivate::GpuProcessStartAllowed() const { if (GpuAccessAllowed(nullptr)) return true; +#if !defined(TOOLKIT_QT) #if defined(USE_X11) || defined(OS_MACOSX) || defined(OS_FUCHSIA) // If GPU access is disabled with OOP-D we run the display compositor in: // Browser process: Windows @@ -377,6 +378,7 @@ bool GpuDataManagerImplPrivate::GpuProcessStartAllowed() const { if (features::IsVizDisplayCompositorEnabled()) return true; #endif +#endif return false; } |