diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-03-25 07:47:06 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-25 07:47:06 -0400 |
commit | 5ae562bfc3507f12f562dfcb0cecd5ad1ec0fd20 (patch) | |
tree | 93cd726d39efa4e30caf5bfca37fef5fb96e32c5 /components/script/dom/baseaudiocontext.rs | |
parent | 40d599e39ffdd627b8912388dc24de77291f700f (diff) | |
parent | dc41d2fb77e99862701d5b527a32b90163ffdb42 (diff) | |
download | servo-5ae562bfc3507f12f562dfcb0cecd5ad1ec0fd20.tar.gz servo-5ae562bfc3507f12f562dfcb0cecd5ad1ec0fd20.zip |
Auto merge of #22944 - ferjm:player.shutdown, r=ceyusa
Shutdown player when HTMLMediaElement is dropped
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #22931
- [X] There are tests for these changes
<!-- 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/22944)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/baseaudiocontext.rs')
-rw-r--r-- | components/script/dom/baseaudiocontext.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/components/script/dom/baseaudiocontext.rs b/components/script/dom/baseaudiocontext.rs index 9429a03c1aa..96f21eeddfc 100644 --- a/components/script/dom/baseaudiocontext.rs +++ b/components/script/dom/baseaudiocontext.rs @@ -50,7 +50,8 @@ use servo_media::audio::context::{AudioContext, AudioContextOptions, ProcessingS use servo_media::audio::context::{OfflineAudioContextOptions, RealTimeAudioContextOptions}; use servo_media::audio::decoder::AudioDecoderCallbacks; use servo_media::audio::graph::NodeId; -use servo_media::{Backend, ServoMedia}; +use servo_media::ServoMedia; +use servo_media_auto::Backend; use std::cell::Cell; use std::collections::{HashMap, VecDeque}; use std::mem; @@ -75,7 +76,7 @@ struct DecodeResolver { pub struct BaseAudioContext { eventtarget: EventTarget, #[ignore_malloc_size_of = "servo_media"] - audio_context_impl: AudioContext<Backend>, + audio_context_impl: AudioContext, /// https://webaudio.github.io/web-audio-api/#dom-baseaudiocontext-destination destination: MutNullableDom<AudioDestinationNode>, listener: MutNullableDom<AudioListener>, @@ -108,6 +109,8 @@ impl BaseAudioContext { }, }; + ServoMedia::init::<Backend>(); + let context = BaseAudioContext { eventtarget: EventTarget::new_inherited(), audio_context_impl: ServoMedia::get() @@ -131,7 +134,7 @@ impl BaseAudioContext { false } - pub fn audio_context_impl(&self) -> &AudioContext<Backend> { + pub fn audio_context_impl(&self) -> &AudioContext { &self.audio_context_impl } |