diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-31 16:33:43 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-06 16:33:22 +0000 |
| commit | da51f56cc21233c2d30f0fe0d171727c3102b2e0 (patch) | |
| tree | 4e579ab70ce4b19bee7984237f3ce05a96d59d83 /chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_win.cc | |
| parent | c8c2d1901aec01e934adf561a9fdf0cc776cdef8 (diff) | |
| download | qtwebengine-chromium-da51f56cc21233c2d30f0fe0d171727c3102b2e0.tar.gz | |
BASELINE: Update Chromium to 65.0.3525.40
Also imports missing submodules
Change-Id: I36901b7c6a325cda3d2c10cedb2186c25af3b79b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_win.cc')
| -rw-r--r-- | chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_win.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_win.cc b/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_win.cc index f256f70b43d..bca5dd4efad 100644 --- a/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_win.cc +++ b/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_win.cc @@ -334,6 +334,7 @@ void BluetoothRemoteGattCharacteristicWin:: std::unique_ptr<BTH_LE_GATT_CHARACTERISTIC_VALUE> value, HRESULT hr) { DCHECK(ui_task_runner_->RunsTasksInCurrentSequence()); + characteristic_value_read_or_write_in_progress_ = false; std::pair<ValueCallback, ErrorCallback> callbacks; callbacks.swap(read_characteristic_value_callbacks_); @@ -346,12 +347,12 @@ void BluetoothRemoteGattCharacteristicWin:: callbacks.first.Run(characteristic_value_); } - characteristic_value_read_or_write_in_progress_ = false; } void BluetoothRemoteGattCharacteristicWin:: OnWriteRemoteCharacteristicValueCallback(HRESULT hr) { DCHECK(ui_task_runner_->RunsTasksInCurrentSequence()); + characteristic_value_read_or_write_in_progress_ = false; std::pair<base::Closure, ErrorCallback> callbacks; callbacks.swap(write_characteristic_value_callbacks_); @@ -360,7 +361,6 @@ void BluetoothRemoteGattCharacteristicWin:: } else { callbacks.first.Run(); } - characteristic_value_read_or_write_in_progress_ = false; } BluetoothRemoteGattService::GattErrorCode |