Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use rooted_vec instead of Vec<JS<T>>

Browse source
This commit is contained in:
Zakor Gyula 2017-02-10 15:14:22 +01:00 • committed by Attila Dusnoki
parent 4a62562b0f
commit f7e86d2d0e
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/script/dom/bluetooth.rs
View file

@ -573,7 +573,6 @@ impl PermissionAlgorithm for Bluetooth {
} }
} }
#[allow(unrooted_must_root)]
// https://webbluetoothcg.github.io/web-bluetooth/#query-the-bluetooth-permission // https://webbluetoothcg.github.io/web-bluetooth/#query-the-bluetooth-permission
fn permission_query(cx: *mut JSContext, promise: &Rc<Promise>, fn permission_query(cx: *mut JSContext, promise: &Rc<Promise>,
descriptor: &BluetoothPermissionDescriptor, descriptor: &BluetoothPermissionDescriptor,
@ -590,7 +589,7 @@ impl PermissionAlgorithm for Bluetooth {
} }
// Step 4. // Step 4.
let mut matching_devices: Vec<JS<BluetoothDevice>> = Vec::new(); rooted_vec!(let mut matching_devices);
// TODO: Step 5: Create a map between the current setting object and BluetoothPermissionData // TODO: Step 5: Create a map between the current setting object and BluetoothPermissionData
// extra permission data, which replaces the exisitng EXTRA_PERMISSION_DATA global variable. // extra permission data, which replaces the exisitng EXTRA_PERMISSION_DATA global variable.
@ -644,13 +643,13 @@ impl PermissionAlgorithm for Bluetooth {
// Step 6.3. // Step 6.3.
// TODO: Implement this correctly, not just using device ids here. // TODO: Implement this correctly, not just using device ids here.
// https://webbluetoothcg.github.io/web-bluetooth/#get-the-bluetoothdevice-representing // https://webbluetoothcg.github.io/web-bluetooth/#get-the-bluetoothdevice-representing
if let Some(ref device) = device_map.get(&device_id) { if let Some(device) = device_map.get(&device_id) {
matching_devices.push(JS::from_ref(&*device)); matching_devices.push(JS::from_ref(&**device));
} }
} }
// Step 7. // Step 7.
status.set_devices(matching_devices); status.set_devices(matching_devices.drain(..).collect());
// https://w3c.github.io/permissions/#dom-permissions-query // https://w3c.github.io/permissions/#dom-permissions-query
// Step 7. // Step 7.