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

Auto merge of #14205 - szeged:minor-fixes, r=jdm

Browse source 
Minor fixes for the WebBluetooth implementation

<!-- Please describe your changes on the following line: -->
1. Fix for a comment typo in `bluetooth.rs `.
2. Simplify caling `self.request_bluetooth_devices` in `bluetooth.rs` in `Step 2`.
We already have a check in `Step 1` to prevent calling `request_bluetooth_devices` with a `Some` value if `option.acceptAllDevices` is true, and `option.filters` is already an `Option`, so there is no need for the `None` in the else branch.
3. Updating the bluetooth extension in `Navigator.webidl `, to match the [specification](https://webbluetoothcg.github.io/web-bluetooth/#navigator-extensions).
4. Replace the `_` separating the characteristic property strings with `-` as described  [here](http://git.kernel.org/cgit/bluetooth/bluez.git/tree/doc/gatt-api.txt#n142)

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14205)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-11-14 13:50:51 -06:00 • committed by GitHub
commit 4f53626c23
3 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/bluetooth/lib.rs
View file

@ -465,13 +465,13 @@ impl BluetoothManager {
match flag.as_ref() { match flag.as_ref() {
"broadcast" => props.insert(BROADCAST), "broadcast" => props.insert(BROADCAST),
"read" => props.insert(READ), "read" => props.insert(READ),
"write_without_response" => props.insert(WRITE_WITHOUT_RESPONSE), "write-without-response" => props.insert(WRITE_WITHOUT_RESPONSE),
"write" => props.insert(WRITE), "write" => props.insert(WRITE),
"notify" => props.insert(NOTIFY), "notify" => props.insert(NOTIFY),
"indicate" => props.insert(INDICATE), "indicate" => props.insert(INDICATE),
"authenticated_signed_writes" => props.insert(AUTHENTICATED_SIGNED_WRITES), "authenticated-signed-writes" => props.insert(AUTHENTICATED_SIGNED_WRITES),
"reliable_write" => props.insert(RELIABLE_WRITE), "reliable-write" => props.insert(RELIABLE_WRITE),
"writable_auxiliaries" => props.insert(WRITABLE_AUXILIARIES), "writable-auxiliaries" => props.insert(WRITABLE_AUXILIARIES),
_ => (), _ => (),
} }
} }

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

@ -194,7 +194,7 @@ fn convert_request_device_options(filters: &Option<Vec<BluetoothRequestDeviceFil
// Step 2.7. // Step 2.7.
// Note: What we are doing here is adding the not blacklisted UUIDs to the result vector, // Note: What we are doing here is adding the not blacklisted UUIDs to the result vector,
// insted of removing them from an already filled vector. // instead of removing them from an already filled vector.
if !uuid_is_blacklisted(uuid.as_ref(), Blacklist::All) { if !uuid_is_blacklisted(uuid.as_ref(), Blacklist::All) {
optional_services_uuids.push(uuid); optional_services_uuids.push(uuid);
} }
@ -337,11 +337,7 @@ impl BluetoothMethods for Bluetooth {
return p; return p;
} }
// Step 2. // Step 2.
if !option.acceptAllDevices { self.request_bluetooth_devices(&p, &option.filters, &option.optionalServices);
self.request_bluetooth_devices(&p, &option.filters, &option.optionalServices);
} else {
self.request_bluetooth_devices(&p, &None, &option.optionalServices);
}
// TODO(#4282): Step 3-5: Reject and resolve promise. // TODO(#4282): Step 3-5: Reject and resolve promise.
return p; return p;
} }

7
components/script/dom/webidls/Navigator.webidl
View file

@ -7,7 +7,6 @@ interface Navigator {
// objects implementing this interface also implement the interfaces given below // objects implementing this interface also implement the interfaces given below
}; };
Navigator implements NavigatorID; Navigator implements NavigatorID;
Navigator implements NavigatorBluetooth;
Navigator implements NavigatorLanguage; Navigator implements NavigatorLanguage;
//Navigator implements NavigatorOnLine; //Navigator implements NavigatorOnLine;
//Navigator implements NavigatorContentUtils; //Navigator implements NavigatorContentUtils;
@ -27,9 +26,9 @@ interface NavigatorID {
readonly attribute DOMString userAgent; readonly attribute DOMString userAgent;
}; };
[NoInterfaceObject] // https://webbluetoothcg.github.io/web-bluetooth/#navigator-extensions
interface NavigatorBluetooth { partial interface Navigator {
readonly attribute Bluetooth bluetooth; readonly attribute Bluetooth bluetooth;
}; };
// https://w3c.github.io/ServiceWorker/#navigator-service-worker // https://w3c.github.io/ServiceWorker/#navigator-service-worker