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

Update servo-media after crate split up. Allows building for Android

Browse source
This commit is contained in:
Fernando Jiménez Moreno 2018-07-12 11:05:29 +02:00
parent b68c791b8d
commit f0a691e474
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/Cargo.toml
View file

@ -87,7 +87,7 @@ servo_arc = {path = "../servo_arc"}
servo_atoms = {path = "../atoms"} servo_atoms = {path = "../atoms"}
servo_config = {path = "../config"} servo_config = {path = "../config"}
servo_geometry = {path = "../geometry" } 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_rand = {path = "../rand"}
servo_url = {path = "../url"} servo_url = {path = "../url"}
smallvec = "0.6" smallvec = "0.6"

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

@ -31,9 +31,9 @@ use dom::oscillatornode::OscillatorNode;
use dom::promise::Promise; use dom::promise::Promise;
use dom::window::Window; use dom::window::Window;
use dom_struct::dom_struct; use dom_struct::dom_struct;
use servo_media::ServoMedia;
use js::rust::CustomAutoRooterGuard; use js::rust::CustomAutoRooterGuard;
use js::typedarray::ArrayBuffer; use js::typedarray::ArrayBuffer;
use servo_media::{Backend, ServoMedia};
use servo_media::audio::context::{AudioContext, ProcessingState}; use servo_media::audio::context::{AudioContext, ProcessingState};
use servo_media::audio::context::{OfflineAudioContextOptions, RealTimeAudioContextOptions}; use servo_media::audio::context::{OfflineAudioContextOptions, RealTimeAudioContextOptions};
use servo_media::audio::decoder::AudioDecoderCallbacks; use servo_media::audio::decoder::AudioDecoderCallbacks;
@ -64,7 +64,7 @@ struct DecodeResolver {
pub struct BaseAudioContext { pub struct BaseAudioContext {
eventtarget: EventTarget, eventtarget: EventTarget,
#[ignore_malloc_size_of = "servo_media"] #[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 /// https://webaudio.github.io/web-audio-api/#dom-baseaudiocontext-destination
destination: MutNullableDom<AudioDestinationNode>, destination: MutNullableDom<AudioDestinationNode>,
/// Resume promises which are soon to be fulfilled by a queued task. /// Resume promises which are soon to be fulfilled by a queued task.
@ -118,7 +118,7 @@ impl BaseAudioContext {
false false
} }
pub fn audio_context_impl(&self) -> Rc<AudioContext> { pub fn audio_context_impl(&self) -> Rc<AudioContext<Backend>> {
self.audio_context_impl.clone() self.audio_context_impl.clone()
} }

3
components/script/dom/bindings/trace.rs
View file

@ -80,6 +80,7 @@ use offscreen_gl_context::GLLimits;
use parking_lot::RwLock; use parking_lot::RwLock;
use profile_traits::mem::ProfilerChan as MemProfilerChan; use profile_traits::mem::ProfilerChan as MemProfilerChan;
use profile_traits::time::ProfilerChan as TimeProfilerChan; use profile_traits::time::ProfilerChan as TimeProfilerChan;
use servo_media::Backend;
use servo_media::audio::buffer_source_node::AudioBuffer; use servo_media::audio::buffer_source_node::AudioBuffer;
use servo_media::audio::context::AudioContext; use servo_media::audio::context::AudioContext;
use servo_media::audio::graph::NodeId; use servo_media::audio::graph::NodeId;
@ -435,7 +436,7 @@ unsafe_no_jsmanaged_fields!(CanvasId);
unsafe_no_jsmanaged_fields!(SourceSet); unsafe_no_jsmanaged_fields!(SourceSet);
unsafe_no_jsmanaged_fields!(AudioGraph); unsafe_no_jsmanaged_fields!(AudioGraph);
unsafe_no_jsmanaged_fields!(AudioBuffer); 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!(NodeId);
unsafe_no_jsmanaged_fields!(ParamType); unsafe_no_jsmanaged_fields!(ParamType);