diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2022-05-06 09:24:31 +0200 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2022-05-23 09:06:48 +0000 |
| commit | 73d8d18f1f662923716a03437d6ffee829deb5a6 (patch) | |
| tree | 7f0698a9c66cc53a22dd9bd5d7c1af73f19c3a96 | |
| parent | acde086abfa804917448d8e3bdca470917d0e658 (diff) | |
| download | qtwebengine-chromium-73d8d18f1f662923716a03437d6ffee829deb5a6.tar.gz | |
FIXUP: Disable alternate window station of Windows sandbox
This is necessary after upstream change:
5129a5e714d67 Win: Initialize alternate desktop earlier.
https://chromium-review.googlesource.com/c/chromium/src/+/2656961
Change-Id: Icdca68666b32c84a6335ca7f044a77cb6061cf69
Fixes: QTBUG-102738
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 72d76568fe90b072c0199391b5b5b47c3052e79f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | chromium/sandbox/policy/sandbox.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chromium/sandbox/policy/sandbox.cc b/chromium/sandbox/policy/sandbox.cc index 95482e83b8b..4270dc744c0 100644 --- a/chromium/sandbox/policy/sandbox.cc +++ b/chromium/sandbox/policy/sandbox.cc @@ -71,7 +71,12 @@ bool Sandbox::Initialize(SandboxType sandbox_type, // process because it will initialize the sandbox broker, which requires // the process to swap its window station. During this time all the UI // will be broken. This has to run before threads and windows are created. +#ifdef TOOLKIT_QT + // Disable alternate window station due to QTBUG-83300 + ResultCode result = policy->CreateAlternateDesktop(false); +#else ResultCode result = policy->CreateAlternateDesktop(true); +#endif CHECK(SBOX_ERROR_FAILED_TO_SWITCH_BACK_WINSTATION != result); } return true; |