diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2020-02-10 14:05:06 +0100 |
|---|---|---|
| committer | Jüri Valdmann <juri.valdmann@qt.io> | 2020-02-11 10:49:22 +0000 |
| commit | a370b2f7a7e2b0cdf091541d743a1ccbfed0c704 (patch) | |
| tree | f5ce8baefde9ca3041f80bb04cc265187f0440e3 | |
| parent | 458aa4294db511c3662da190399d1ecd78b478f6 (diff) | |
| download | qtwebengine-chromium-a370b2f7a7e2b0cdf091541d743a1ccbfed0c704.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 33bcde9031e..5727a120a0d 100644 --- a/chromium/content/browser/gpu/gpu_data_manager_impl_private.cc +++ b/chromium/content/browser/gpu/gpu_data_manager_impl_private.cc @@ -373,6 +373,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 @@ -381,6 +382,7 @@ bool GpuDataManagerImplPrivate::GpuProcessStartAllowed() const { if (features::IsVizDisplayCompositorEnabled()) return true; #endif +#endif return false; } |