diff options
Diffstat (limited to 'components/script/dom/bluetoothuuid.rs')
-rw-r--r-- | components/script/dom/bluetoothuuid.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/components/script/dom/bluetoothuuid.rs b/components/script/dom/bluetoothuuid.rs index 6ee56780e3f..e16d8141e50 100644 --- a/components/script/dom/bluetoothuuid.rs +++ b/components/script/dom/bluetoothuuid.rs @@ -7,7 +7,7 @@ use dom::bindings::error::Error::Type; use dom::bindings::error::Fallible; use dom::bindings::reflector::Reflector; use dom::bindings::str::DOMString; -use dom::globalscope::GlobalScope; +use dom::window::Window; use regex::Regex; pub type UUID = DOMString; @@ -283,22 +283,22 @@ const DESCRIPTOR_ERROR_MESSAGE: &'static str = "https://developer.bluetooth.org/ impl BluetoothUUID { // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothuuid-canonicaluuid - pub fn CanonicalUUID(_: &GlobalScope, alias: u32) -> UUID { + pub fn CanonicalUUID(_: &Window, alias: u32) -> UUID { canonical_uuid(alias) } // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothuuid-getservice - pub fn GetService(_: &GlobalScope, name: BluetoothServiceUUID) -> Fallible<UUID> { + pub fn GetService(_: &Window, name: BluetoothServiceUUID) -> Fallible<UUID> { Self::service(name) } // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothuuid-getcharacteristic - pub fn GetCharacteristic(_: &GlobalScope, name: BluetoothCharacteristicUUID) -> Fallible<UUID> { + pub fn GetCharacteristic(_: &Window, name: BluetoothCharacteristicUUID) -> Fallible<UUID> { Self::characteristic(name) } // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothuuid-getdescriptor - pub fn GetDescriptor(_: &GlobalScope, name: BluetoothDescriptorUUID) -> Fallible<UUID> { + pub fn GetDescriptor(_: &Window, name: BluetoothDescriptorUUID) -> Fallible<UUID> { Self::descriptor(name) } } @@ -308,7 +308,7 @@ impl BluetoothUUID { resolve_uuid_name(name, BLUETOOTH_ASSIGNED_SERVICES, SERVICE_PREFIX) } - pub fn characteristic(name: BluetoothServiceUUID) -> Fallible<UUID> { + pub fn characteristic(name: BluetoothCharacteristicUUID) -> Fallible<UUID> { resolve_uuid_name(name, BLUETOOTH_ASSIGNED_CHARCTERISTICS, CHARACTERISTIC_PREFIX) } |