Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 14:53:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add proof parameter to Promise::new_in_current_compartment

Browse source
This commit is contained in:
Aron Zwaan 2019-04-24 18:53:50 +02:00
parent 7b293ee8cb
commit 1b6949d4cf
25 changed files with 263 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

15
components/script/dom/baseaudiocontext.rs
View file

@ -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();