diff options
author | Peter Varga <pvarga@inf.u-szeged.hu> | 2023-02-22 13:25:25 +0100 |
---|---|---|
committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2023-02-23 14:08:24 +0000 |
commit | ed9d108fc6eaeedc401c05813e4e2e29ccdeacc2 (patch) | |
tree | b0d266427018368d470091fbefbaa76b9bbf24d6 /chromium/sandbox/win/src/interception_agent.cc | |
parent | 588986e4d3589bc8ae950de5fca94bd60066c3da (diff) | |
download | qtwebengine-chromium-ed9d108fc6eaeedc401c05813e4e2e29ccdeacc2.tar.gz |
[Backport][Windows] Remove unused sidestep intercepts.
This CL removes the unused sidestep intercepts and associated code.
The code was never ported to 64-bit and isn't used in 32-bit builds.
Task-number: QTBUG-108240
Bug: 1270309
Review-URL: https://chromium-review.googlesource.com/c/chromium/src/+/3324867
Cr-Commit-Position: refs/heads/main@{#950447}
Change-Id: Ib0e97a593b2218a6d93a99e16a55ff34f8607a61
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/462007
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/sandbox/win/src/interception_agent.cc')
-rw-r--r-- | chromium/sandbox/win/src/interception_agent.cc | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/chromium/sandbox/win/src/interception_agent.cc b/chromium/sandbox/win/src/interception_agent.cc index e095328a710..26e65dffb88 100644 --- a/chromium/sandbox/win/src/interception_agent.cc +++ b/chromium/sandbox/win/src/interception_agent.cc @@ -15,7 +15,6 @@ #include "sandbox/win/src/interception_internal.h" #include "sandbox/win/src/interceptors.h" #include "sandbox/win/src/sandbox_nt_util.h" -#include "sandbox/win/src/sidestep_resolver.h" namespace { @@ -202,31 +201,13 @@ bool InterceptionAgent::PatchDll(const DllPatchInfo* dll_info, // This method is called from within the loader lock ResolverThunk* InterceptionAgent::GetResolver(InterceptionType type) { static EatResolverThunk* eat_resolver = nullptr; - static SidestepResolverThunk* sidestep_resolver = nullptr; - static SmartSidestepResolverThunk* smart_sidestep_resolver = nullptr; if (!eat_resolver) eat_resolver = new (NT_ALLOC) EatResolverThunk; -#if !defined(_WIN64) - // Sidestep is not supported for x64. - if (!sidestep_resolver) - sidestep_resolver = new (NT_ALLOC) SidestepResolverThunk; - - if (!smart_sidestep_resolver) - smart_sidestep_resolver = new (NT_ALLOC) SmartSidestepResolverThunk; -#endif - - switch (type) { - case INTERCEPTION_EAT: - return eat_resolver; - case INTERCEPTION_SIDESTEP: - return sidestep_resolver; - case INTERCEPTION_SMART_SIDESTEP: - return smart_sidestep_resolver; - default: - NOTREACHED_NT(); - } + if (type == INTERCEPTION_EAT) + return eat_resolver; + NOTREACHED_NT(); return nullptr; } |