diff --git a/components/script/dom/bluetooth.rs b/components/script/dom/bluetooth.rs index 143bc04855a..a0e5484abd3 100644 --- a/components/script/dom/bluetooth.rs +++ b/components/script/dom/bluetooth.rs @@ -8,7 +8,6 @@ use dom::bindings::codegen::Bindings::BluetoothBinding::{self, BluetoothMethods, use dom::bindings::codegen::Bindings::BluetoothBinding::RequestDeviceOptions; use dom::bindings::error::Error::{self, Security, Type}; use dom::bindings::error::Fallible; -use dom::bindings::global::GlobalRef; use dom::bindings::js::Root; use dom::bindings::reflector::{Reflectable, Reflector, reflect_dom_object}; use dom::bindings::str::DOMString; @@ -271,10 +270,10 @@ fn canonicalize_filter(filter: &BluetoothRequestDeviceFilter) -> Fallible(global_ref: GlobalRef, +pub fn result_to_promise(global: &GlobalScope, bluetooth_result: Fallible) -> Rc { - let p = Promise::new(global_ref.as_global_scope()); + let p = Promise::new(global); match bluetooth_result { Ok(v) => p.resolve_native(p.global().r().get_cx(), &v), Err(e) => p.reject_error(p.global().r().get_cx(), e), @@ -298,6 +297,6 @@ impl BluetoothMethods for Bluetooth { #[allow(unrooted_must_root)] // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetooth-requestdevice fn RequestDevice(&self, option: &RequestDeviceOptions) -> Rc { - result_to_promise(self.global().r(), self.request_device(option)) + result_to_promise(&self.global_scope(), self.request_device(option)) } } diff --git a/components/script/dom/bluetoothremotegattcharacteristic.rs b/components/script/dom/bluetoothremotegattcharacteristic.rs index faa6eba4bef..425fcffb9cb 100644 --- a/components/script/dom/bluetoothremotegattcharacteristic.rs +++ b/components/script/dom/bluetoothremotegattcharacteristic.rs @@ -212,7 +212,7 @@ impl BluetoothRemoteGATTCharacteristicMethods for BluetoothRemoteGATTCharacteris #[allow(unrooted_must_root)] // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattcharacteristic-getdescriptor fn GetDescriptor(&self, descriptor: BluetoothDescriptorUUID) -> Rc { - result_to_promise(self.global().r(), self.get_descriptor(descriptor)) + result_to_promise(&self.global_scope(), self.get_descriptor(descriptor)) } #[allow(unrooted_must_root)] @@ -220,7 +220,7 @@ impl BluetoothRemoteGATTCharacteristicMethods for BluetoothRemoteGATTCharacteris fn GetDescriptors(&self, descriptor: Option) -> Rc { - result_to_promise(self.global().r(), self.get_descriptors(descriptor)) + result_to_promise(&self.global_scope(), self.get_descriptors(descriptor)) } // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattcharacteristic-value @@ -231,12 +231,12 @@ impl BluetoothRemoteGATTCharacteristicMethods for BluetoothRemoteGATTCharacteris #[allow(unrooted_must_root)] // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattcharacteristic-readvalue fn ReadValue(&self) -> Rc { - result_to_promise(self.global().r(), self.read_value()) + result_to_promise(&self.global_scope(), self.read_value()) } #[allow(unrooted_must_root)] // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattcharacteristic-writevalue fn WriteValue(&self, value: Vec) -> Rc { - result_to_promise(self.global().r(), self.write_value(value)) + result_to_promise(&self.global_scope(), self.write_value(value)) } } diff --git a/components/script/dom/bluetoothremotegattdescriptor.rs b/components/script/dom/bluetoothremotegattdescriptor.rs index 2bc2821f607..d42742bc235 100644 --- a/components/script/dom/bluetoothremotegattdescriptor.rs +++ b/components/script/dom/bluetoothremotegattdescriptor.rs @@ -135,12 +135,12 @@ impl BluetoothRemoteGATTDescriptorMethods for BluetoothRemoteGATTDescriptor { #[allow(unrooted_must_root)] // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattdescriptor-readvalue fn ReadValue(&self) -> Rc { - result_to_promise(self.global().r(), self.read_value()) + result_to_promise(&self.global_scope(), self.read_value()) } #[allow(unrooted_must_root)] // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattdescriptor-writevalue fn WriteValue(&self, value: Vec) -> Rc { - result_to_promise(self.global().r(), self.write_value(value)) + result_to_promise(&self.global_scope(), self.write_value(value)) } } diff --git a/components/script/dom/bluetoothremotegattserver.rs b/components/script/dom/bluetoothremotegattserver.rs index a9712216d61..703be681a23 100644 --- a/components/script/dom/bluetoothremotegattserver.rs +++ b/components/script/dom/bluetoothremotegattserver.rs @@ -138,7 +138,7 @@ impl BluetoothRemoteGATTServerMethods for BluetoothRemoteGATTServer { #[allow(unrooted_must_root)] // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattserver-connect fn Connect(&self) -> Rc { - result_to_promise(self.global().r(), self.connect()) + result_to_promise(&self.global_scope(), self.connect()) } // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattserver-disconnect @@ -161,7 +161,7 @@ impl BluetoothRemoteGATTServerMethods for BluetoothRemoteGATTServer { #[allow(unrooted_must_root)] // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattserver-getprimaryservice fn GetPrimaryService(&self, service: BluetoothServiceUUID) -> Rc { - result_to_promise(self.global().r(), self.get_primary_service(service)) + result_to_promise(&self.global_scope(), self.get_primary_service(service)) } #[allow(unrooted_must_root)] @@ -169,6 +169,6 @@ impl BluetoothRemoteGATTServerMethods for BluetoothRemoteGATTServer { fn GetPrimaryServices(&self, service: Option) -> Rc { - result_to_promise(self.global().r(), self.get_primary_services(service)) + result_to_promise(&self.global_scope(), self.get_primary_services(service)) } } diff --git a/components/script/dom/bluetoothremotegattservice.rs b/components/script/dom/bluetoothremotegattservice.rs index 29e2625b818..94082277768 100644 --- a/components/script/dom/bluetoothremotegattservice.rs +++ b/components/script/dom/bluetoothremotegattservice.rs @@ -236,7 +236,7 @@ impl BluetoothRemoteGATTServiceMethods for BluetoothRemoteGATTService { fn GetCharacteristic(&self, characteristic: BluetoothCharacteristicUUID) -> Rc { - result_to_promise(self.global().r(), self.get_characteristic(characteristic)) + result_to_promise(&self.global_scope(), self.get_characteristic(characteristic)) } #[allow(unrooted_must_root)] @@ -244,7 +244,7 @@ impl BluetoothRemoteGATTServiceMethods for BluetoothRemoteGATTService { fn GetCharacteristics(&self, characteristic: Option) -> Rc { - result_to_promise(self.global().r(), self.get_characteristics(characteristic)) + result_to_promise(&self.global_scope(), self.get_characteristics(characteristic)) } #[allow(unrooted_must_root)] @@ -252,7 +252,7 @@ impl BluetoothRemoteGATTServiceMethods for BluetoothRemoteGATTService { fn GetIncludedService(&self, service: BluetoothServiceUUID) -> Rc { - result_to_promise(self.global().r(), self.get_included_service(service)) + result_to_promise(&self.global_scope(), self.get_included_service(service)) } #[allow(unrooted_must_root)] @@ -260,6 +260,6 @@ impl BluetoothRemoteGATTServiceMethods for BluetoothRemoteGATTService { fn GetIncludedServices(&self, service: Option) -> Rc { - result_to_promise(self.global().r(), self.get_included_services(service)) + result_to_promise(&self.global_scope(), self.get_included_services(service)) } }