diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-10-24 11:47:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-24 11:47:59 -0400 |
| commit | abc0f50d208722f4f55e1742ba55936369ecdc3f (patch) | |
| tree | 35b32bfaa519d6edcb3f0183e2b873408a90ac55 | |
| parent | 657173abd8331842c4c81a9ad0773d55523e824f (diff) | |
| parent | 21f67a99f5beec9923d0a8a568b20a02e6ec65f9 (diff) | |
| download | servo-abc0f50d208722f4f55e1742ba55936369ecdc3f.tar.gz servo-abc0f50d208722f4f55e1742ba55936369ecdc3f.zip | |
Auto merge of #22014 - ferjm:update.servo.media, r=asajeffrey
Update servo-media to fix intermittent timeouts
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #22010
<!-- 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/22014)
<!-- Reviewable:end -->
| -rw-r--r-- | Cargo.lock | 10 | ||||
| -rw-r--r-- | components/script/dom/htmlmediaelement.rs | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/Cargo.lock b/Cargo.lock index 2182c709851..3c0f09bcdc5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3259,7 +3259,7 @@ dependencies = [ [[package]] name = "servo-media" version = "0.1.0" -source = "git+https://github.com/servo/media#a9cfeabf1616ef680473836098784884388156ee" +source = "git+https://github.com/servo/media#3b347d7b0431c58611e2bd7b22d34062b64cda26" dependencies = [ "servo-media-audio 0.1.0 (git+https://github.com/servo/media)", "servo-media-gstreamer 0.1.0 (git+https://github.com/servo/media)", @@ -3269,7 +3269,7 @@ dependencies = [ [[package]] name = "servo-media-audio" version = "0.1.0" -source = "git+https://github.com/servo/media#a9cfeabf1616ef680473836098784884388156ee" +source = "git+https://github.com/servo/media#3b347d7b0431c58611e2bd7b22d34062b64cda26" dependencies = [ "boxfnonce 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "byte-slice-cast 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3286,7 +3286,7 @@ dependencies = [ [[package]] name = "servo-media-gstreamer" version = "0.1.0" -source = "git+https://github.com/servo/media#a9cfeabf1616ef680473836098784884388156ee" +source = "git+https://github.com/servo/media#3b347d7b0431c58611e2bd7b22d34062b64cda26" dependencies = [ "byte-slice-cast 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "glib 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3304,7 +3304,7 @@ dependencies = [ [[package]] name = "servo-media-player" version = "0.1.0" -source = "git+https://github.com/servo/media#a9cfeabf1616ef680473836098784884388156ee" +source = "git+https://github.com/servo/media#3b347d7b0431c58611e2bd7b22d34062b64cda26" dependencies = [ "ipc-channel 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3400,7 +3400,7 @@ dependencies = [ [[package]] name = "servo_media_derive" version = "0.1.0" -source = "git+https://github.com/servo/media#a9cfeabf1616ef680473836098784884388156ee" +source = "git+https://github.com/servo/media#3b347d7b0431c58611e2bd7b22d34062b64cda26" dependencies = [ "quote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index ba0dfd896fe..8aad0820502 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -1038,7 +1038,9 @@ impl HTMLMediaElement { }, _ => {}, }, - PlayerEvent::PositionChanged(_) => { + PlayerEvent::PositionChanged(_) | + PlayerEvent::SeekData(_) | + PlayerEvent::SeekDone(_) => { // TODO: Support for HTMLMediaElement seeking and related API properties #21998 }, PlayerEvent::EndOfStream => { |