Skip to content

Commit

Permalink
Use GeckoMedia in MSE implementation
Browse files Browse the repository at this point in the history
  • Loading branch information
ferjm committed Dec 22, 2017
1 parent fc223f9 commit 6d207e2
Show file tree
Hide file tree
Showing 7 changed files with 833 additions and 337 deletions.
24 changes: 23 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions components/atoms/static_atoms.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ screen
search
select
serif
sourceclose
sourceended
sourceopen
statechange
Expand Down
2 changes: 1 addition & 1 deletion components/script/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ phf_shared = "0.7.18"
serde_json = "1.0"

[target.'cfg(all(any(target_os = "macos", target_os = "linux"), not(any(target_arch = "arm", target_arch = "aarch64"))))'.dependencies]
gecko-media = {git = "https://github.com/servo/gecko-media.git"}
gecko-media = {path = "/Users/ferjm/dev/mozilla/gecko-media/gecko-media"}

[target.'cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))'.dependencies]
tinyfiledialogs = "2.5.9"
Expand Down
4 changes: 4 additions & 0 deletions components/script/dom/bindings/trace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ use dom::document::PendingRestyle;
use encoding_rs::Encoding;
use euclid::{Transform2D, Transform3D, Point2D, Vector2D, Rect, TypedSize2D, TypedScale};
use euclid::Length as EuclidLength;
use gecko_media::{GeckoMediaSource, GeckoMediaSourceBuffer, GeckoMediaSourceBufferList};
use html5ever::{Prefix, LocalName, Namespace, QualName};
use html5ever::buffer_queue::BufferQueue;
use html5ever::tendril::IncompleteUtf8;
Expand Down Expand Up @@ -429,6 +430,9 @@ unsafe_no_jsmanaged_fields!(WebVRGamepadHand);
unsafe_no_jsmanaged_fields!(ScriptToConstellationChan);
unsafe_no_jsmanaged_fields!(InteractiveMetrics);
unsafe_no_jsmanaged_fields!(InteractiveWindow);
unsafe_no_jsmanaged_fields!(GeckoMediaSource);
unsafe_no_jsmanaged_fields!(GeckoMediaSourceBuffer);
unsafe_no_jsmanaged_fields!(GeckoMediaSourceBufferList);

unsafe impl<'a> JSTraceable for &'a str {
#[inline]
Expand Down
Loading

0 comments on commit 6d207e2

Please sign in to comment.