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/device/bluetooth/bluetooth_init_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/device/bluetooth/bluetooth_init_win.cc')
| -rw-r--r-- | chromium/device/bluetooth/bluetooth_init_win.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chromium/device/bluetooth/bluetooth_init_win.cc b/chromium/device/bluetooth/bluetooth_init_win.cc index ab41d47174b..c623f10e6c1 100644 --- a/chromium/device/bluetooth/bluetooth_init_win.cc +++ b/chromium/device/bluetooth/bluetooth_init_win.cc @@ -4,7 +4,7 @@ #include "device/bluetooth/bluetooth_init_win.h" -#include "base/threading/scoped_blocking_call.h" +#include "base/threading/scoped_thread_priority.h" namespace { @@ -28,8 +28,10 @@ bool HasBluetoothStack() { } has_bluetooth_stack = HBS_UNKNOWN; if (has_bluetooth_stack == HBS_UNKNOWN) { - base::ScopedBlockingCall scoped_blocking_call( - FROM_HERE, base::BlockingType::MAY_BLOCK); + // Mitigate the issues caused by loading DLLs on a background thread + // (http://crbug/973868). + SCOPED_MAY_LOAD_LIBRARY_AT_BACKGROUND_PRIORITY_REPEATEDLY(); + HRESULT hr = E_FAIL; __try { hr = __HrLoadAllImportsForDll("bthprops.cpl"); |