diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2020-01-24 17:10:21 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-24 17:10:21 -0500 |
commit | 12693b51f510761d5dd58a9103596a192edb803c (patch) | |
tree | 9e2e750f620ae592f35705f3b4cc959f22525628 /components/script/dom/bluetooth.rs | |
parent | 60238afa6ce1aa9078908b5fefd5426f48a9911b (diff) | |
parent | 5a3e1b8e6903c825e50597a218532d417f1dfef9 (diff) | |
download | servo-12693b51f510761d5dd58a9103596a192edb803c.tar.gz servo-12693b51f510761d5dd58a9103596a192edb803c.zip |
Auto merge of #25597 - kunalmohan:25581-Compartment, r=jdm
Rename compartment to realm
<!-- Please describe your changes on the following line: -->
Rename compartment-related terminology to use realms instead.
r?@jdm
---
<!-- 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] These changes fix #25581 (GitHub issue number if applicable)
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
Diffstat (limited to 'components/script/dom/bluetooth.rs')
-rw-r--r-- | components/script/dom/bluetooth.rs | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/components/script/dom/bluetooth.rs b/components/script/dom/bluetooth.rs index d28717e3eaf..c769cfcef94 100644 --- a/components/script/dom/bluetooth.rs +++ b/components/script/dom/bluetooth.rs @@ -7,7 +7,7 @@ use bluetooth_traits::{BluetoothResponse, BluetoothResponseResult}; use bluetooth_traits::blocklist::{Blocklist, uuid_is_blocklisted}; use bluetooth_traits::scanfilter::{BluetoothScanfilter, BluetoothScanfilterSequence}; use bluetooth_traits::scanfilter::{RequestDeviceoptions, ServiceUUIDSequence}; -use crate::compartments::{AlreadyInCompartment, InCompartment}; +use crate::realms::{AlreadyInRealm, InRealm}; use crate::dom::bindings::cell::{DomRefCell, Ref}; use crate::dom::bindings::codegen::Bindings::BluetoothBinding::{self, BluetoothDataFilterInit}; use crate::dom::bindings::codegen::Bindings::BluetoothBinding::{BluetoothMethods, RequestDeviceOptions}; @@ -291,11 +291,8 @@ where T: AsyncBluetoothListener + DomObject + 'static, F: FnOnce(StringOrUnsignedLong) -> Fallible<UUID>, { - let in_compartment_proof = AlreadyInCompartment::assert(&attribute.global()); - let p = Promise::new_in_current_compartment( - &attribute.global(), - InCompartment::Already(&in_compartment_proof), - ); + let in_realm_proof = AlreadyInRealm::assert(&attribute.global()); + let p = Promise::new_in_current_realm(&attribute.global(), InRealm::Already(&in_realm_proof)); let result_uuid = if let Some(u) = uuid { // Step 1. @@ -534,8 +531,8 @@ impl From<BluetoothError> for Error { impl BluetoothMethods for Bluetooth { // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetooth-requestdevice - fn RequestDevice(&self, option: &RequestDeviceOptions, comp: InCompartment) -> Rc<Promise> { - let p = Promise::new_in_current_compartment(&self.global(), comp); + fn RequestDevice(&self, option: &RequestDeviceOptions, comp: InRealm) -> Rc<Promise> { + let p = Promise::new_in_current_realm(&self.global(), comp); // Step 1. if (option.filters.is_some() && option.acceptAllDevices) || (option.filters.is_none() && !option.acceptAllDevices) @@ -552,8 +549,8 @@ impl BluetoothMethods for Bluetooth { } // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetooth-getavailability - fn GetAvailability(&self, comp: InCompartment) -> Rc<Promise> { - let p = Promise::new_in_current_compartment(&self.global(), comp); + fn GetAvailability(&self, comp: InRealm) -> Rc<Promise> { + let p = Promise::new_in_current_realm(&self.global(), comp); // Step 1. We did not override the method // Step 2 - 3. in handle_response let sender = response_async(&p, self); |