aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/bluetoothremotegattservice.rs
diff options
context:
space:
mode:
Diffstat (limited to 'components/script/dom/bluetoothremotegattservice.rs')
-rw-r--r--components/script/dom/bluetoothremotegattservice.rs169
1 files changed, 95 insertions, 74 deletions
diff --git a/components/script/dom/bluetoothremotegattservice.rs b/components/script/dom/bluetoothremotegattservice.rs
index 347604df311..62b46a8b9bd 100644
--- a/components/script/dom/bluetoothremotegattservice.rs
+++ b/components/script/dom/bluetoothremotegattservice.rs
@@ -1,63 +1,63 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use crate::dom::bindings::codegen::Bindings::BluetoothRemoteGATTServerBinding::BluetoothRemoteGATTServerMethods;
+use crate::dom::bindings::codegen::Bindings::BluetoothRemoteGATTServiceBinding::BluetoothRemoteGATTServiceMethods;
+use crate::dom::bindings::error::Error;
+use crate::dom::bindings::reflector::reflect_dom_object;
+use crate::dom::bindings::root::{Dom, DomRoot};
+use crate::dom::bindings::str::DOMString;
+use crate::dom::bluetooth::{get_gatt_children, AsyncBluetoothListener};
+use crate::dom::bluetoothdevice::BluetoothDevice;
+use crate::dom::bluetoothuuid::{BluetoothCharacteristicUUID, BluetoothServiceUUID, BluetoothUUID};
+use crate::dom::eventtarget::EventTarget;
+use crate::dom::globalscope::GlobalScope;
+use crate::dom::promise::Promise;
use bluetooth_traits::{BluetoothResponse, GATTType};
-use dom::bindings::codegen::Bindings::BluetoothRemoteGATTServerBinding::BluetoothRemoteGATTServerMethods;
-use dom::bindings::codegen::Bindings::BluetoothRemoteGATTServiceBinding;
-use dom::bindings::codegen::Bindings::BluetoothRemoteGATTServiceBinding::BluetoothRemoteGATTServiceMethods;
-use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull;
-use dom::bindings::error::Error;
-use dom::bindings::js::{JS, Root};
-use dom::bindings::reflector::reflect_dom_object;
-use dom::bindings::str::DOMString;
-use dom::bluetooth::{AsyncBluetoothListener, get_gatt_children};
-use dom::bluetoothdevice::BluetoothDevice;
-use dom::bluetoothuuid::{BluetoothCharacteristicUUID, BluetoothServiceUUID, BluetoothUUID};
-use dom::eventtarget::EventTarget;
-use dom::globalscope::GlobalScope;
-use dom::promise::Promise;
use dom_struct::dom_struct;
-use js::jsapi::JSContext;
use std::rc::Rc;
// https://webbluetoothcg.github.io/web-bluetooth/#bluetoothremotegattservice
#[dom_struct]
pub struct BluetoothRemoteGATTService {
eventtarget: EventTarget,
- device: JS<BluetoothDevice>,
+ device: Dom<BluetoothDevice>,
uuid: DOMString,
is_primary: bool,
instance_id: String,
}
impl BluetoothRemoteGATTService {
- pub fn new_inherited(device: &BluetoothDevice,
- uuid: DOMString,
- is_primary: bool,
- instance_id: String)
- -> BluetoothRemoteGATTService {
+ pub fn new_inherited(
+ device: &BluetoothDevice,
+ uuid: DOMString,
+ is_primary: bool,
+ instance_id: String,
+ ) -> BluetoothRemoteGATTService {
BluetoothRemoteGATTService {
eventtarget: EventTarget::new_inherited(),
- device: JS::from_ref(device),
+ device: Dom::from_ref(device),
uuid: uuid,
is_primary: is_primary,
instance_id: instance_id,
}
}
- pub fn new(global: &GlobalScope,
- device: &BluetoothDevice,
- uuid: DOMString,
- isPrimary: bool,
- instanceID: String)
- -> Root<BluetoothRemoteGATTService> {
- reflect_dom_object(box BluetoothRemoteGATTService::new_inherited(device,
- uuid,
- isPrimary,
- instanceID),
- global,
- BluetoothRemoteGATTServiceBinding::Wrap)
+ #[allow(non_snake_case)]
+ pub fn new(
+ global: &GlobalScope,
+ device: &BluetoothDevice,
+ uuid: DOMString,
+ isPrimary: bool,
+ instanceID: String,
+ ) -> DomRoot<BluetoothRemoteGATTService> {
+ reflect_dom_object(
+ Box::new(BluetoothRemoteGATTService::new_inherited(
+ device, uuid, isPrimary, instanceID,
+ )),
+ global,
+ )
}
fn get_instance_id(&self) -> String {
@@ -67,8 +67,8 @@ impl BluetoothRemoteGATTService {
impl BluetoothRemoteGATTServiceMethods for BluetoothRemoteGATTService {
// https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattservice-device
- fn Device(&self) -> Root<BluetoothDevice> {
- Root::from_ref(&self.device)
+ fn Device(&self) -> DomRoot<BluetoothDevice> {
+ DomRoot::from_ref(&self.device)
}
// https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattservice-isprimary
@@ -81,41 +81,59 @@ impl BluetoothRemoteGATTServiceMethods for BluetoothRemoteGATTService {
self.uuid.clone()
}
- #[allow(unrooted_must_root)]
// https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattservice-getcharacteristic
- fn GetCharacteristic(&self,
- characteristic: BluetoothCharacteristicUUID)
- -> Rc<Promise> {
- get_gatt_children(self, true, BluetoothUUID::characteristic, Some(characteristic), self.get_instance_id(),
- self.Device().get_gatt().Connected(), GATTType::Characteristic)
+ fn GetCharacteristic(&self, characteristic: BluetoothCharacteristicUUID) -> Rc<Promise> {
+ get_gatt_children(
+ self,
+ true,
+ BluetoothUUID::characteristic,
+ Some(characteristic),
+ self.get_instance_id(),
+ self.Device().get_gatt().Connected(),
+ GATTType::Characteristic,
+ )
}
- #[allow(unrooted_must_root)]
// https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattservice-getcharacteristics
- fn GetCharacteristics(&self,
- characteristic: Option<BluetoothCharacteristicUUID>)
- -> Rc<Promise> {
- get_gatt_children(self, false, BluetoothUUID::characteristic, characteristic, self.get_instance_id(),
- self.Device().get_gatt().Connected(), GATTType::Characteristic)
+ fn GetCharacteristics(
+ &self,
+ characteristic: Option<BluetoothCharacteristicUUID>,
+ ) -> Rc<Promise> {
+ get_gatt_children(
+ self,
+ false,
+ BluetoothUUID::characteristic,
+ characteristic,
+ self.get_instance_id(),
+ self.Device().get_gatt().Connected(),
+ GATTType::Characteristic,
+ )
}
- #[allow(unrooted_must_root)]
// https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattservice-getincludedservice
- fn GetIncludedService(&self,
- service: BluetoothServiceUUID)
- -> Rc<Promise> {
- get_gatt_children(self, false, BluetoothUUID::service, Some(service), self.get_instance_id(),
- self.Device().get_gatt().Connected(), GATTType::IncludedService)
+ fn GetIncludedService(&self, service: BluetoothServiceUUID) -> Rc<Promise> {
+ get_gatt_children(
+ self,
+ false,
+ BluetoothUUID::service,
+ Some(service),
+ self.get_instance_id(),
+ self.Device().get_gatt().Connected(),
+ GATTType::IncludedService,
+ )
}
-
- #[allow(unrooted_must_root)]
// https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattservice-getincludedservices
- fn GetIncludedServices(&self,
- service: Option<BluetoothServiceUUID>)
- -> Rc<Promise> {
- get_gatt_children(self, false, BluetoothUUID::service, service, self.get_instance_id(),
- self.Device().get_gatt().Connected(), GATTType::IncludedService)
+ fn GetIncludedServices(&self, service: Option<BluetoothServiceUUID>) -> Rc<Promise> {
+ get_gatt_children(
+ self,
+ false,
+ BluetoothUUID::service,
+ service,
+ self.get_instance_id(),
+ self.Device().get_gatt().Connected(),
+ GATTType::IncludedService,
+ )
}
// https://webbluetoothcg.github.io/web-bluetooth/#dom-serviceeventhandlers-onserviceadded
@@ -129,39 +147,42 @@ impl BluetoothRemoteGATTServiceMethods for BluetoothRemoteGATTService {
}
impl AsyncBluetoothListener for BluetoothRemoteGATTService {
- fn handle_response(&self, response: BluetoothResponse, promise_cx: *mut JSContext, promise: &Rc<Promise>) {
+ fn handle_response(&self, response: BluetoothResponse, promise: &Rc<Promise>) {
let device = self.Device();
match response {
// https://webbluetoothcg.github.io/web-bluetooth/#getgattchildren
// 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!();
+ let mut characteristics = vec![];
for characteristic in characteristics_vec {
- let bt_characteristic = device.get_or_create_characteristic(&characteristic, &self);
+ 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!();
+ 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())),
+ _ => promise.reject_error(Error::Type("Something went wrong...".to_owned())),
}
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 19:19:45 +0000