diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/base/profiler/stack_sampler_win.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/base/profiler/stack_sampler_win.cc')
| -rw-r--r-- | chromium/base/profiler/stack_sampler_win.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chromium/base/profiler/stack_sampler_win.cc b/chromium/base/profiler/stack_sampler_win.cc index c19009b77e4..2a29d4c0ee8 100644 --- a/chromium/base/profiler/stack_sampler_win.cc +++ b/chromium/base/profiler/stack_sampler_win.cc @@ -17,14 +17,15 @@ namespace base { std::unique_ptr<StackSampler> StackSampler::Create( SamplingProfilerThreadToken thread_token, ModuleCache* module_cache, - std::unique_ptr<Unwinder> native_unwinder, + std::vector<std::unique_ptr<Unwinder>> core_unwinders, StackSamplerTestDelegate* test_delegate) { - DCHECK(!native_unwinder); + DCHECK(core_unwinders.empty()); #if defined(ARCH_CPU_X86_64) || defined(ARCH_CPU_ARM64) + core_unwinders.push_back(std::make_unique<NativeUnwinderWin>()); return std::make_unique<StackSamplerImpl>( std::make_unique<StackCopierSuspend>( std::make_unique<SuspendableThreadDelegateWin>(thread_token)), - std::make_unique<NativeUnwinderWin>(), module_cache, test_delegate); + std::move(core_unwinders), module_cache, test_delegate); #else return nullptr; #endif |