diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-04-13 20:28:17 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-13 20:28:17 -0400 |
commit | 17204544d975a44f813b96ed3e0eae3b688596bc (patch) | |
tree | ffd9955f782586a4e28a6a8f87b99edf359f1ae8 /components/script/dom/bindings/trace.rs | |
parent | ce2a0d3b7063ea20163643ac68e180027ea676ed (diff) | |
parent | 0eb2c1d02ea7fbd868bfefb4674599816450b3a2 (diff) | |
download | servo-17204544d975a44f813b96ed3e0eae3b688596bc.tar.gz servo-17204544d975a44f813b96ed3e0eae3b688596bc.zip |
Auto merge of #23157 - ferjm:gum.playback, r=Manishearth
MediaStream playback through audio and video elements
- [X] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] 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/23157)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/bindings/trace.rs')
-rw-r--r-- | components/script/dom/bindings/trace.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index 2ce4566bb5a..f1734d74b55 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -104,7 +104,7 @@ use servo_media::audio::graph::NodeId; use servo_media::audio::panner_node::{DistanceModel, PanningModel}; use servo_media::audio::param::ParamType; use servo_media::player::Player; -use servo_media::streams::MediaStream as BackendMediaStream; +use servo_media::streams::registry::MediaStreamId; use servo_media::webrtc::WebRtcController; use servo_url::{ImmutableOrigin, MutableOrigin, ServoUrl}; use smallvec::SmallVec; @@ -488,7 +488,7 @@ unsafe_no_jsmanaged_fields!(NodeId); unsafe_no_jsmanaged_fields!(AnalysisEngine, DistanceModel, PanningModel, ParamType); unsafe_no_jsmanaged_fields!(dyn Player); unsafe_no_jsmanaged_fields!(WebRtcController); -unsafe_no_jsmanaged_fields!(dyn BackendMediaStream); +unsafe_no_jsmanaged_fields!(MediaStreamId); unsafe_no_jsmanaged_fields!(Mutex<MediaFrameRenderer>); unsafe_no_jsmanaged_fields!(RenderApiSender); unsafe_no_jsmanaged_fields!(ResourceFetchTiming); |