diff options
| author | Fernando Jiménez Moreno <ferjmoreno@gmail.com> | 2018-09-13 14:15:31 +0200 |
|---|---|---|
| committer | Fernando Jiménez Moreno <ferjmoreno@gmail.com> | 2018-10-08 16:12:02 +0200 |
| commit | b656ae195fc0784e9582e4fe7a19eddaba2debf0 (patch) | |
| tree | 4b7b903e4f1d2e474764f6b8c2331b82d2c7b04b | |
| parent | 8fd9b72eb7c93cb0334a8ad0261828da72b6eef9 (diff) | |
| download | servo-b656ae195fc0784e9582e4fe7a19eddaba2debf0.tar.gz servo-b656ae195fc0784e9582e4fe7a19eddaba2debf0.zip | |
Player pause
| -rw-r--r-- | Cargo.lock | 24 | ||||
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | components/script/dom/htmlmediaelement.rs | 3 |
3 files changed, 13 insertions, 16 deletions
diff --git a/Cargo.lock b/Cargo.lock index fc7cf588e38..f07221dd8a8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2992,7 +2992,7 @@ dependencies = [ "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", "serde_bytes 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-media 0.1.0 (git+https://github.com/ferjm/media?branch=framerenderer)", + "servo-media 0.1.0 (git+https://github.com/servo/media)", "servo_allocator 0.0.1", "servo_arc 0.1.1", "servo_atoms 0.0.1", @@ -3226,9 +3226,9 @@ name = "servo-media" version = "0.1.0" source = "git+https://github.com/servo/media#e700a0834c3f38d49890d846591fd699e7405a48" dependencies = [ - "servo-media-audio 0.1.0 (git+https://github.com/ferjm/media?branch=framerenderer)", - "servo-media-gstreamer 0.1.0 (git+https://github.com/ferjm/media?branch=framerenderer)", - "servo-media-player 0.1.0 (git+https://github.com/ferjm/media?branch=framerenderer)", + "servo-media-audio 0.1.0 (git+https://github.com/servo/media)", + "servo-media-gstreamer 0.1.0 (git+https://github.com/servo/media)", + "servo-media-player 0.1.0 (git+https://github.com/servo/media)", ] [[package]] @@ -3243,7 +3243,7 @@ dependencies = [ "petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", - "servo_media_derive 0.1.0 (git+https://github.com/ferjm/media?branch=framerenderer)", + "servo_media_derive 0.1.0 (git+https://github.com/servo/media)", "smallvec 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3260,8 +3260,8 @@ dependencies = [ "gstreamer-player 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-media-audio 0.1.0 (git+https://github.com/ferjm/media?branch=framerenderer)", - "servo-media-player 0.1.0 (git+https://github.com/ferjm/media?branch=framerenderer)", + "servo-media-audio 0.1.0 (git+https://github.com/servo/media)", + "servo-media-player 0.1.0 (git+https://github.com/servo/media)", "zip 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -4547,12 +4547,12 @@ dependencies = [ "checksum servo-fontconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "93f799b649b4a2bf362398910eca35240704c7e765e780349b2bb1070d892262" "checksum servo-fontconfig-sys 4.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b0aa080856db55f188aaf36f01cae8c03448a6056552adb77d461179e44e1a14" "checksum servo-freetype-sys 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9232032c2e85118c0282c6562c84cab12316e655491ba0a5d1905b2320060d1b" -"checksum servo-media 0.1.0 (git+https://github.com/ferjm/media?branch=framerenderer)" = "<none>" -"checksum servo-media-audio 0.1.0 (git+https://github.com/ferjm/media?branch=framerenderer)" = "<none>" -"checksum servo-media-gstreamer 0.1.0 (git+https://github.com/ferjm/media?branch=framerenderer)" = "<none>" -"checksum servo-media-player 0.1.0 (git+https://github.com/ferjm/media?branch=framerenderer)" = "<none>" +"checksum servo-media 0.1.0 (git+https://github.com/servo/media)" = "<none>" +"checksum servo-media-audio 0.1.0 (git+https://github.com/servo/media)" = "<none>" +"checksum servo-media-gstreamer 0.1.0 (git+https://github.com/servo/media)" = "<none>" +"checksum servo-media-player 0.1.0 (git+https://github.com/servo/media)" = "<none>" "checksum servo-skia 0.30000019.1 (registry+https://github.com/rust-lang/crates.io-index)" = "82eddddcf9512dd7c60eccdb486e60e5bd4930afaa4da2d7d4afdff75950fb88" -"checksum servo_media_derive 0.1.0 (git+https://github.com/ferjm/media?branch=framerenderer)" = "<none>" +"checksum servo_media_derive 0.1.0 (git+https://github.com/servo/media)" = "<none>" "checksum sha1 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cc30b1e1e8c40c121ca33b86c23308a090d19974ef001b4bf6e61fd1a0fb095c" "checksum shared_library 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8254bf098ce4d8d7cc7cc6de438c5488adc5297e5b7ffef88816c0a91bd289c1" "checksum sig 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c6649e43c1a1e68d29ed56d0dc3b5b6cf3b901da77cf107c4066b9e3da036df5" diff --git a/Cargo.toml b/Cargo.toml index d4af6793704..bb452af5fa6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,5 +22,3 @@ opt-level = 3 # # [patch."https://github.com/servo/<repository>"] # <crate> = { path = "/path/to/local/checkout" } -[patch."https://github.com/servo/media"] -servo-media = { git = "https://github.com/ferjm/media", branch = "framerenderer" } diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index 55d0a24cb47..311f1ed779c 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -360,8 +360,7 @@ impl HTMLMediaElement { // Step 2.3.2. this.upcast::<EventTarget>().fire_event(atom!("pause")); - //FIXME(victor) - //this.player.pause(); + this.player.pause(); // Step 2.3.3. // Done after running this closure in |