diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2018-06-06 12:24:57 +0200 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2018-06-12 06:41:01 +0000 |
| commit | ed85627aba4507280c4f9506dc1ea22b2d033284 (patch) | |
| tree | 3d948143b9da60791589ebc02cdf5385dc92516e | |
| parent | 52575771d7501e6fea05afb4513fe0454dd93283 (diff) | |
| download | qtwebengine-chromium-ed85627aba4507280c4f9506dc1ea22b2d033284.tar.gz | |
[Backport] Don't collect full GPU info or D3D12/Vulkan info if in-process-gpu.
Otherwise it will trigger a gl_factory.cc assertion.
BUG=831168
TEST=chrome --in-process-gpu
R=oetuaho@nvidia.com
Reviewed-on: https://chromium-review.googlesource.com/1024859
Commit-Queue: Zhenyao Mo <zmo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553201}
Change-Id: I65b1b3a54b352d66c75294bca7eb8bc9006e0e4e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/content/browser/gpu/gpu_data_manager_impl_private.cc | 4 |
1 files changed, 4 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 657b6381461..232dde3c516 100644 --- a/chromium/content/browser/gpu/gpu_data_manager_impl_private.cc +++ b/chromium/content/browser/gpu/gpu_data_manager_impl_private.cc @@ -327,6 +327,8 @@ void GpuDataManagerImplPrivate::RequestCompleteGpuInfoIfNeeded() { return; if (!GpuAccessAllowed(nullptr)) return; + if (in_process_gpu_) + return; complete_gpu_info_already_requested_ = true; @@ -346,6 +348,8 @@ void GpuDataManagerImplPrivate::RequestCompleteGpuInfoIfNeeded() { void GpuDataManagerImplPrivate::RequestGpuSupportedRuntimeVersion() { #if defined(OS_WIN) + if (in_process_gpu_) + return; base::OnceClosure task = base::BindOnce([]() { GpuProcessHost* host = GpuProcessHost::Get( GpuProcessHost::GPU_PROCESS_KIND_UNSANDBOXED, true /* force_create */); |