aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/bluetoothremotegattcharacteristic.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-04-29 13:59:04 -0400
committerGitHub <noreply@github.com>2019-04-29 13:59:04 -0400
commit852223b08a007e348d0c8e64b9eeed6ab0432b4f (patch)
treeedae21502c7544b7361b96195204d18e2d9b9c66 /components/script/dom/bluetoothremotegattcharacteristic.rs
parent67beaa46e2015643e76becf18f415430ecb382bf (diff)
parent3229af509f9931f85a1372323f90427d2ad5898d (diff)
downloadservo-852223b08a007e348d0c8e64b9eeed6ab0432b4f.tar.gz
servo-852223b08a007e348d0c8e64b9eeed6ab0432b4f.zip
Auto merge of #23253 - BartGitHub:refactor-promise-compartment, r=jdm
Refactor promise compartment <!-- Please describe your changes on the following line: --> This PR adds a mechanism to verify that certain code is executed inside a ```JSAutoCompartment```, and applies this to the ```Promise::new_in_current_compartment``` constructor. 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 #23167 <!-- Either: --> - [x] These changes do not require tests because they do not change existing functionality. <!-- 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. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23253) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/bluetoothremotegattcharacteristic.rs')
-rw-r--r--components/script/dom/bluetoothremotegattcharacteristic.rs29
1 files changed, 21 insertions, 8 deletions
diff --git a/components/script/dom/bluetoothremotegattcharacteristic.rs b/components/script/dom/bluetoothremotegattcharacteristic.rs
index 812c16d1040..440e0523492 100644
--- a/components/script/dom/bluetoothremotegattcharacteristic.rs
+++ b/components/script/dom/bluetoothremotegattcharacteristic.rs
@@ -2,6 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+use crate::compartments::{AlreadyInCompartment, InCompartment};
use crate::dom::bindings::cell::DomRefCell;
use crate::dom::bindings::codegen::Bindings::BluetoothCharacteristicPropertiesBinding::BluetoothCharacteristicPropertiesMethods;
use crate::dom::bindings::codegen::Bindings::BluetoothRemoteGATTCharacteristicBinding;
@@ -134,9 +135,12 @@ impl BluetoothRemoteGATTCharacteristicMethods for BluetoothRemoteGATTCharacteris
}
// https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattcharacteristic-readvalue
- #[allow(unsafe_code)]
fn ReadValue(&self) -> Rc<Promise> {
- let p = unsafe { Promise::new_in_current_compartment(&self.global()) };
+ let in_compartment_proof = AlreadyInCompartment::assert(&self.global());
+ let p = Promise::new_in_current_compartment(
+ &self.global(),
+ InCompartment::Already(&in_compartment_proof),
+ );
// Step 1.
if uuid_is_blocklisted(self.uuid.as_ref(), Blocklist::Reads) {
@@ -168,9 +172,12 @@ impl BluetoothRemoteGATTCharacteristicMethods for BluetoothRemoteGATTCharacteris
}
// https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattcharacteristic-writevalue
- #[allow(unsafe_code)]
fn WriteValue(&self, value: ArrayBufferViewOrArrayBuffer) -> Rc<Promise> {
- let p = unsafe { Promise::new_in_current_compartment(&self.global()) };
+ let in_compartment_proof = AlreadyInCompartment::assert(&self.global());
+ let p = Promise::new_in_current_compartment(
+ &self.global(),
+ InCompartment::Already(&in_compartment_proof),
+ );
// Step 1.
if uuid_is_blocklisted(self.uuid.as_ref(), Blocklist::Writes) {
@@ -220,9 +227,12 @@ impl BluetoothRemoteGATTCharacteristicMethods for BluetoothRemoteGATTCharacteris
}
// https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattcharacteristic-startnotifications
- #[allow(unsafe_code)]
fn StartNotifications(&self) -> Rc<Promise> {
- let p = unsafe { Promise::new_in_current_compartment(&self.global()) };
+ let in_compartment_proof = AlreadyInCompartment::assert(&self.global());
+ let p = Promise::new_in_current_compartment(
+ &self.global(),
+ InCompartment::Already(&in_compartment_proof),
+ );
// Step 1.
if uuid_is_blocklisted(self.uuid.as_ref(), Blocklist::Reads) {
@@ -258,9 +268,12 @@ impl BluetoothRemoteGATTCharacteristicMethods for BluetoothRemoteGATTCharacteris
}
// https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattcharacteristic-stopnotifications
- #[allow(unsafe_code)]
fn StopNotifications(&self) -> Rc<Promise> {
- let p = unsafe { Promise::new_in_current_compartment(&self.global()) };
+ let in_compartment_proof = AlreadyInCompartment::assert(&self.global());
+ let p = Promise::new_in_current_compartment(
+ &self.global(),
+ InCompartment::Already(&in_compartment_proof),
+ );
let sender = response_async(&p, self);
// TODO: Step 3 - 4: Implement `active notification context set` for BluetoothRemoteGATTCharacteristic,