Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix Trusted usage in audio decoder to queue tasks (#3)

Browse source
This commit is contained in:
Manish Goregaokar 2018-07-09 23:02:17 -07:00 • committed by Fernando Jiménez Moreno
parent 34ba14385a
commit 8f9a081ff0
2 changed files with 39 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -195,7 +195,8 @@ impl BaseAudioContext {
} }
pub fn resume(&self) { pub fn resume(&self) {
let window = DomRoot::downcast::<Window>(self.global()).unwrap(); let global = self.global();
let window = global.as_window();
let task_source = window.dom_manipulation_task_source(); let task_source = window.dom_manipulation_task_source();
let this = Trusted::new(self); let this = Trusted::new(self);
// Set the rendering thread state to 'running' and start // Set the rendering thread state to 'running' and start
@ -321,6 +322,8 @@ impl BaseAudioContextMethods for BaseAudioContext {
-> Rc<Promise> { -> Rc<Promise> {
// Step 1. // Step 1.
let promise = Promise::new(&self.global()); let promise = Promise::new(&self.global());
let global = self.global();
let window = global.as_window();
if audio_data.len() > 0 { if audio_data.len() > 0 {
// Step 2. // Step 2.
@ -337,35 +340,43 @@ impl BaseAudioContextMethods for BaseAudioContext {
let decoded_audio_ = decoded_audio.clone(); let decoded_audio_ = decoded_audio.clone();
let this = Trusted::new(self); let this = Trusted::new(self);
let this_ = this.clone(); let this_ = this.clone();
let task_source = window.dom_manipulation_task_source();
let task_source_ = window.dom_manipulation_task_source();
let canceller = window.task_canceller();
let canceller_ = window.task_canceller();
let callbacks = AudioDecoderCallbacks::new() let callbacks = AudioDecoderCallbacks::new()
.eos(move || { .eos(move || {
let this = this_.root(); let _ = task_source.queue_with_canceller(task!(audio_decode_eos: move || {
let decoded_audio = decoded_audio.lock().unwrap(); let this = this.root();
let buffer = AudioBuffer::new( let decoded_audio = decoded_audio.lock().unwrap();
&this.global().as_window(), let buffer = AudioBuffer::new(
1, // XXX servo-media should provide this info &this.global().as_window(),
decoded_audio.len() as u32, 1, // XXX servo-media should provide this info
this.sample_rate, decoded_audio.len() as u32,
Some(decoded_audio.as_slice())); this.sample_rate,
let mut resolvers = this.decode_resolvers.borrow_mut(); Some(decoded_audio.as_slice()));
assert!(resolvers.contains_key(&uuid_)); let mut resolvers = this.decode_resolvers.borrow_mut();
let resolver = resolvers.remove(&uuid_).unwrap(); assert!(resolvers.contains_key(&uuid_));
if let Some(callback) = resolver.success_callback { let resolver = resolvers.remove(&uuid_).unwrap();
let _ = callback.Call__(&buffer, ExceptionHandling::Report); if let Some(callback) = resolver.success_callback {
} let _ = callback.Call__(&buffer, ExceptionHandling::Report);
resolver.promise.resolve_native(&buffer); }
resolver.promise.resolve_native(&buffer);
}), &canceller);
}) })
.error(move || { .error(move || {
let this = this.root(); let _ = task_source_.queue_with_canceller(task!(audio_decode_eos: move || {
let mut resolvers = this.decode_resolvers.borrow_mut(); let this = this_.root();
assert!(resolvers.contains_key(&uuid)); let mut resolvers = this.decode_resolvers.borrow_mut();
let resolver = resolvers.remove(&uuid).unwrap(); assert!(resolvers.contains_key(&uuid));
if let Some(callback) = resolver.error_callback { let resolver = resolvers.remove(&uuid).unwrap();
let _ = callback.Call__( if let Some(callback) = resolver.error_callback {
&DOMException::new(&this.global(), DOMErrorName::DataCloneError), let _ = callback.Call__(
ExceptionHandling::Report); &DOMException::new(&this.global(), DOMErrorName::DataCloneError),
} ExceptionHandling::Report);
resolver.promise.reject_error(Error::Type("Audio decode error".to_owned())); }
resolver.promise.reject_error(Error::Type("Audio decode error".to_owned()));
}), &canceller_);
}) })
.progress(move |buffer| { .progress(move |buffer| {
decoded_audio_ decoded_audio_

2
components/script/lib.rs
View file

@ -13,6 +13,8 @@
#![deny(unsafe_code)] #![deny(unsafe_code)]
#![allow(non_snake_case)] #![allow(non_snake_case)]
#![recursion_limit = "128"]
#![doc = "The script crate contains all matters DOM."] #![doc = "The script crate contains all matters DOM."]
#![plugin(script_plugins)] #![plugin(script_plugins)]