diff options
author | Anthony Ramine <n.oxyde@gmail.com> | 2017-09-21 16:00:48 +0200 |
---|---|---|
committer | Anthony Ramine <n.oxyde@gmail.com> | 2017-09-21 16:00:48 +0200 |
commit | 5addc2dfa36a48a657c36ecbda0331bfaa8ebf11 (patch) | |
tree | db35ab2ddce4a406097d59f697ccc01ab0a555f7 /components/script/dom/bluetoothremotegattservice.rs | |
parent | 658dc8a5013973ceff3c91291d5536043b2e8e58 (diff) | |
download | servo-5addc2dfa36a48a657c36ecbda0331bfaa8ebf11.tar.gz servo-5addc2dfa36a48a657c36ecbda0331bfaa8ebf11.zip |
Make Promise::resolve_native actually sound
We shouldn't have to pass a raw JSContext pointer, and to enter the
promise's context's compartment by hand.
Diffstat (limited to 'components/script/dom/bluetoothremotegattservice.rs')
-rw-r--r-- | components/script/dom/bluetoothremotegattservice.rs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/components/script/dom/bluetoothremotegattservice.rs b/components/script/dom/bluetoothremotegattservice.rs index d80bc89f80b..afbd5f1cbb6 100644 --- a/components/script/dom/bluetoothremotegattservice.rs +++ b/components/script/dom/bluetoothremotegattservice.rs @@ -135,8 +135,7 @@ impl AsyncBluetoothListener for BluetoothRemoteGATTService { // Step 7. BluetoothResponse::GetCharacteristics(characteristics_vec, single) => { if single { - promise.resolve_native(promise_cx, - &device.get_or_create_characteristic(&characteristics_vec[0], &self)); + promise.resolve_native(&device.get_or_create_characteristic(&characteristics_vec[0], &self)); return; } let mut characteristics = vec!(); @@ -144,21 +143,20 @@ impl AsyncBluetoothListener for BluetoothRemoteGATTService { let bt_characteristic = device.get_or_create_characteristic(&characteristic, &self); characteristics.push(bt_characteristic); } - promise.resolve_native(promise_cx, &characteristics); + promise.resolve_native(&characteristics); }, // https://webbluetoothcg.github.io/web-bluetooth/#getgattchildren // Step 7. BluetoothResponse::GetIncludedServices(services_vec, single) => { if single { - return promise.resolve_native(promise_cx, - &device.get_or_create_service(&services_vec[0], &device.get_gatt())); + return promise.resolve_native(&device.get_or_create_service(&services_vec[0], &device.get_gatt())); } let mut services = vec!(); for service in services_vec { let bt_service = device.get_or_create_service(&service, &device.get_gatt()); services.push(bt_service); } - promise.resolve_native(promise_cx, &services); + promise.resolve_native(&services); }, _ => promise.reject_error(promise_cx, Error::Type("Something went wrong...".to_owned())), } |