diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-12-22 06:51:16 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-22 06:51:16 -0800 |
commit | 23590f683a06b67f666e83009513b67ed8225ce7 (patch) | |
tree | 073ae6944c5679bf01a2284cc871628e6e890a83 /components/bluetooth_traits | |
parent | b843be49752c68926521a8b5f6b0405b1ff01e9b (diff) | |
parent | 6e02cb2eb99cd633579ed99acef2240f90f173c5 (diff) | |
download | servo-23590f683a06b67f666e83009513b67ed8225ce7.tar.gz servo-23590f683a06b67f666e83009513b67ed8225ce7.zip |
Auto merge of #14612 - szeged:connect-disconnect-update, r=jdm
Updating GATTServer's Connect/Disconnect calls
<!-- Please describe your changes on the following line: -->
Added the missing [Step 5.2.3](https://github.com/servo/servo/compare/master...szeged:connect-disconnect-update#diff-1dbe29f87740f5aec93f37adbecace6cR213) to the `connect` function.
Updated the [disconnect](https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattserver-disconnect) function to its current state in the specification, including the `clean_up_disconnected_device` and the `garbage_collect_the connection` functions.
Added new tests for checking the invalid state of JS objects after disconnection.
---
<!-- 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
- [x] There are tests for these changes
<!-- 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/14612)
<!-- Reviewable:end -->
Diffstat (limited to 'components/bluetooth_traits')
-rw-r--r-- | components/bluetooth_traits/lib.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/components/bluetooth_traits/lib.rs b/components/bluetooth_traits/lib.rs index f7293b74bb4..e38c122f72d 100644 --- a/components/bluetooth_traits/lib.rs +++ b/components/bluetooth_traits/lib.rs @@ -85,12 +85,14 @@ pub type BluetoothResponseResult = Result<BluetoothResponse, BluetoothError>; pub enum BluetoothRequest { RequestDevice(RequestDeviceoptions, IpcSender<BluetoothResponseResult>), GATTServerConnect(String, IpcSender<BluetoothResponseResult>), - GATTServerDisconnect(String, IpcSender<BluetoothResult<bool>>), + GATTServerDisconnect(String, IpcSender<BluetoothResult<()>>), GetGATTChildren(String, Option<String>, bool, GATTType, IpcSender<BluetoothResponseResult>), ReadValue(String, IpcSender<BluetoothResponseResult>), WriteValue(String, Vec<u8>, IpcSender<BluetoothResponseResult>), EnableNotification(String, bool, IpcSender<BluetoothResponseResult>), WatchAdvertisements(String, IpcSender<BluetoothResponseResult>), + SetRepresentedToNull(Vec<String>, Vec<String>, Vec<String>), + IsRepresentedDeviceNull(String, IpcSender<bool>), Test(String, IpcSender<BluetoothResult<()>>), Exit, } |