aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/bluetooth.rs
diff options
context:
space:
mode:
authorAnthony Ramine <n.oxyde@gmail.com>2016-10-05 11:06:25 +0200
committerAnthony Ramine <n.oxyde@gmail.com>2016-10-06 21:36:41 +0200
commitd8e92bb271a9f9dd87bf77e38cd820d01f2f0ae4 (patch)
tree14676fcd23d30d1652023aa14969446f58b83922 /components/script/dom/bluetooth.rs
parentb6bbd41e11a8d73f884b7011905c05bd3efec3cd (diff)
downloadservo-d8e92bb271a9f9dd87bf77e38cd820d01f2f0ae4.tar.gz
servo-d8e92bb271a9f9dd87bf77e38cd820d01f2f0ae4.zip
Rename Reflectable::global_scope to global
Diffstat (limited to 'components/script/dom/bluetooth.rs')
-rw-r--r--components/script/dom/bluetooth.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/components/script/dom/bluetooth.rs b/components/script/dom/bluetooth.rs
index bac83de3023..863d75bfec4 100644
--- a/components/script/dom/bluetooth.rs
+++ b/components/script/dom/bluetooth.rs
@@ -59,7 +59,7 @@ impl Bluetooth {
}
fn get_bluetooth_thread(&self) -> IpcSender<BluetoothMethodMsg> {
- self.global_scope().as_window().bluetooth_thread()
+ self.global().as_window().bluetooth_thread()
}
fn request_device(&self, option: &RequestDeviceOptions) -> Fallible<Root<BluetoothDevice>> {
@@ -103,7 +103,7 @@ impl Bluetooth {
// Step 12-13.
match device {
Ok(device) => {
- let global = self.global_scope();
+ let global = self.global();
let ad_data = BluetoothAdvertisingData::new(&global,
device.appearance,
device.tx_power,
@@ -275,8 +275,8 @@ pub fn result_to_promise<T: ToJSValConvertible>(global: &GlobalScope,
-> Rc<Promise> {
let p = Promise::new(global);
match bluetooth_result {
- Ok(v) => p.resolve_native(p.global_scope().get_cx(), &v),
- Err(e) => p.reject_error(p.global_scope().get_cx(), e),
+ Ok(v) => p.resolve_native(p.global().get_cx(), &v),
+ Err(e) => p.reject_error(p.global().get_cx(), e),
}
p
}
@@ -297,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<Promise> {
- result_to_promise(&self.global_scope(), self.request_device(option))
+ result_to_promise(&self.global(), self.request_device(option))
}
}