aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/baseaudiocontext.rs
diff options
context:
space:
mode:
authorBastien Orivel <eijebong@bananium.fr>2019-05-25 17:00:10 +0200
committerBastien Orivel <eijebong@bananium.fr>2019-05-25 17:28:07 +0200
commit292d468cd1552dd5644e8e0e2bf617b8bcac7655 (patch)
tree0d4069144e989bfab6ebeea66654654ccbb851c5 /components/script/dom/baseaudiocontext.rs
parent0b29caa5548b0e307f2a891f5082b940c10d5762 (diff)
downloadservo-292d468cd1552dd5644e8e0e2bf617b8bcac7655.tar.gz
servo-292d468cd1552dd5644e8e0e2bf617b8bcac7655.zip
Use the newly added inCompartments option everywhere it can be
Diffstat (limited to 'components/script/dom/baseaudiocontext.rs')
-rw-r--r--components/script/dom/baseaudiocontext.rs17
1 files changed, 5 insertions, 12 deletions
diff --git a/components/script/dom/baseaudiocontext.rs b/components/script/dom/baseaudiocontext.rs
index 28096a9c287..29af7839382 100644
--- a/components/script/dom/baseaudiocontext.rs
+++ b/components/script/dom/baseaudiocontext.rs
@@ -2,7 +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::compartments::InCompartment;
use crate::dom::analysernode::AnalyserNode;
use crate::dom::audiobuffer::AudioBuffer;
use crate::dom::audiobuffersourcenode::AudioBufferSourceNode;
@@ -274,13 +274,9 @@ impl BaseAudioContextMethods for BaseAudioContext {
}
/// https://webaudio.github.io/web-audio-api/#dom-baseaudiocontext-resume
- fn Resume(&self) -> Rc<Promise> {
+ fn Resume(&self, comp: InCompartment) -> Rc<Promise> {
// Step 1.
- let in_compartment_proof = AlreadyInCompartment::assert(&self.global());
- let promise = Promise::new_in_current_compartment(
- &self.global(),
- InCompartment::Already(&in_compartment_proof),
- );
+ let promise = Promise::new_in_current_compartment(&self.global(), comp);
// Step 2.
if self.audio_context_impl.state() == ProcessingState::Closed {
@@ -424,13 +420,10 @@ impl BaseAudioContextMethods for BaseAudioContext {
audio_data: CustomAutoRooterGuard<ArrayBuffer>,
decode_success_callback: Option<Rc<DecodeSuccessCallback>>,
decode_error_callback: Option<Rc<DecodeErrorCallback>>,
+ comp: InCompartment,
) -> Rc<Promise> {
// Step 1.
- let in_compartment_proof = AlreadyInCompartment::assert(&self.global());
- let promise = Promise::new_in_current_compartment(
- &self.global(),
- InCompartment::Already(&in_compartment_proof),
- );
+ let promise = Promise::new_in_current_compartment(&self.global(), comp);
let global = self.global();
let window = global.as_window();