diff options
author | Aron Zwaan <aronzwaan@gmail.com> | 2019-04-24 18:53:50 +0200 |
---|---|---|
committer | Aron Zwaan <aronzwaan@gmail.com> | 2019-04-24 19:46:10 +0200 |
commit | 1b6949d4cf951600efa6db6747b65e2db42a96cd (patch) | |
tree | c6270640b2f73045f91c1b65723e865490e69656 /components/script/dom/mediadevices.rs | |
parent | 7b293ee8cba64937c591c36a9a7e1d6c727d247c (diff) | |
download | servo-1b6949d4cf951600efa6db6747b65e2db42a96cd.tar.gz servo-1b6949d4cf951600efa6db6747b65e2db42a96cd.zip |
Add proof parameter to Promise::new_in_current_compartment
Diffstat (limited to 'components/script/dom/mediadevices.rs')
-rw-r--r-- | components/script/dom/mediadevices.rs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/components/script/dom/mediadevices.rs b/components/script/dom/mediadevices.rs index ab931b4d307..eca54b1fd57 100644 --- a/components/script/dom/mediadevices.rs +++ b/components/script/dom/mediadevices.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::codegen::Bindings::MediaDevicesBinding::MediaStreamConstraints; use crate::dom::bindings::codegen::Bindings::MediaDevicesBinding::{self, MediaDevicesMethods}; use crate::dom::bindings::codegen::UnionTypes::BooleanOrMediaTrackConstraints; @@ -44,7 +45,11 @@ impl MediaDevicesMethods for MediaDevices { /// https://w3c.github.io/mediacapture-main/#dom-mediadevices-getusermedia #[allow(unsafe_code)] fn GetUserMedia(&self, constraints: &MediaStreamConstraints) -> 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 media = ServoMedia::get().unwrap(); let mut tracks = vec![]; if let Some(constraints) = convert_constraints(&constraints.audio) { |