diff options
| -rw-r--r-- | components/script/Cargo.toml | 2 | ||||
| -rw-r--r-- | components/script/dom/baseaudiocontext.rs | 6 | ||||
| -rw-r--r-- | components/script/dom/bindings/trace.rs | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 6aa60335808..f33735d5435 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -87,7 +87,7 @@ servo_arc = {path = "../servo_arc"} servo_atoms = {path = "../atoms"} servo_config = {path = "../config"} servo_geometry = {path = "../geometry" } -servo_media = {git = "https://github.com/servo/media"} +servo-media = {git = "https://github.com/servo/media"} servo_rand = {path = "../rand"} servo_url = {path = "../url"} smallvec = "0.6" diff --git a/components/script/dom/baseaudiocontext.rs b/components/script/dom/baseaudiocontext.rs index a6ba9e2fa02..1e2aed3ac7a 100644 --- a/components/script/dom/baseaudiocontext.rs +++ b/components/script/dom/baseaudiocontext.rs @@ -31,9 +31,9 @@ use dom::oscillatornode::OscillatorNode; use dom::promise::Promise; use dom::window::Window; use dom_struct::dom_struct; -use servo_media::ServoMedia; use js::rust::CustomAutoRooterGuard; use js::typedarray::ArrayBuffer; +use servo_media::{Backend, ServoMedia}; use servo_media::audio::context::{AudioContext, ProcessingState}; use servo_media::audio::context::{OfflineAudioContextOptions, RealTimeAudioContextOptions}; use servo_media::audio::decoder::AudioDecoderCallbacks; @@ -64,7 +64,7 @@ struct DecodeResolver { pub struct BaseAudioContext { eventtarget: EventTarget, #[ignore_malloc_size_of = "servo_media"] - audio_context_impl: Rc<AudioContext>, + audio_context_impl: Rc<AudioContext<Backend>>, /// https://webaudio.github.io/web-audio-api/#dom-baseaudiocontext-destination destination: MutNullableDom<AudioDestinationNode>, /// Resume promises which are soon to be fulfilled by a queued task. @@ -118,7 +118,7 @@ impl BaseAudioContext { false } - pub fn audio_context_impl(&self) -> Rc<AudioContext> { + pub fn audio_context_impl(&self) -> Rc<AudioContext<Backend>> { self.audio_context_impl.clone() } diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index bf6ac823603..1e09dcea81e 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -80,6 +80,7 @@ use offscreen_gl_context::GLLimits; use parking_lot::RwLock; use profile_traits::mem::ProfilerChan as MemProfilerChan; use profile_traits::time::ProfilerChan as TimeProfilerChan; +use servo_media::Backend; use servo_media::audio::buffer_source_node::AudioBuffer; use servo_media::audio::context::AudioContext; use servo_media::audio::graph::NodeId; @@ -435,7 +436,7 @@ unsafe_no_jsmanaged_fields!(CanvasId); unsafe_no_jsmanaged_fields!(SourceSet); unsafe_no_jsmanaged_fields!(AudioGraph); unsafe_no_jsmanaged_fields!(AudioBuffer); -unsafe_no_jsmanaged_fields!(AudioContext); +unsafe_no_jsmanaged_fields!(AudioContext<Backend>); unsafe_no_jsmanaged_fields!(NodeId); unsafe_no_jsmanaged_fields!(ParamType); |