aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/baseaudiocontext.rs
diff options
context:
space:
mode:
authorAron Zwaan <aronzwaan@gmail.com>2019-04-24 18:53:50 +0200
committerAron Zwaan <aronzwaan@gmail.com>2019-04-24 19:46:10 +0200
commit1b6949d4cf951600efa6db6747b65e2db42a96cd (patch)
treec6270640b2f73045f91c1b65723e865490e69656 /components/script/dom/baseaudiocontext.rs
parent7b293ee8cba64937c591c36a9a7e1d6c727d247c (diff)
downloadservo-1b6949d4cf951600efa6db6747b65e2db42a96cd.tar.gz
servo-1b6949d4cf951600efa6db6747b65e2db42a96cd.zip
Add proof parameter to Promise::new_in_current_compartment
Diffstat (limited to 'components/script/dom/baseaudiocontext.rs')
-rw-r--r--components/script/dom/baseaudiocontext.rs15
1 files changed, 11 insertions, 4 deletions
diff --git a/components/script/dom/baseaudiocontext.rs b/components/script/dom/baseaudiocontext.rs
index 88e5499f8da..e18a2f8ede8 100644
--- a/components/script/dom/baseaudiocontext.rs
+++ b/components/script/dom/baseaudiocontext.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::analysernode::AnalyserNode;
use crate::dom::audiobuffer::AudioBuffer;
use crate::dom::audiobuffersourcenode::AudioBufferSourceNode;
@@ -271,10 +272,13 @@ impl BaseAudioContextMethods for BaseAudioContext {
}
/// https://webaudio.github.io/web-audio-api/#dom-baseaudiocontext-resume
- #[allow(unsafe_code)]
fn Resume(&self) -> Rc<Promise> {
// Step 1.
- let promise = unsafe { Promise::new_in_current_compartment(&self.global()) };
+ let in_compartment_proof = AlreadyInCompartment::assert(&self.global());
+ let promise = Promise::new_in_current_compartment(
+ &self.global(),
+ &InCompartment::Already(&in_compartment_proof),
+ );
// Step 2.
if self.audio_context_impl.state() == ProcessingState::Closed {
@@ -404,7 +408,6 @@ impl BaseAudioContextMethods for BaseAudioContext {
}
// https://webaudio.github.io/web-audio-api/#dom-baseaudiocontext-decodeaudiodata
- #[allow(unsafe_code)]
fn DecodeAudioData(
&self,
audio_data: CustomAutoRooterGuard<ArrayBuffer>,
@@ -412,7 +415,11 @@ impl BaseAudioContextMethods for BaseAudioContext {
decode_error_callback: Option<Rc<DecodeErrorCallback>>,
) -> Rc<Promise> {
// Step 1.
- let promise = unsafe { Promise::new_in_current_compartment(&self.global()) };
+ let in_compartment_proof = AlreadyInCompartment::assert(&self.global());
+ let promise = Promise::new_in_current_compartment(
+ &self.global(),
+ &InCompartment::Already(&in_compartment_proof),
+ );
let global = self.global();
let window = global.as_window();