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

Make poster frame load blocker independent from media element's one

Browse source
This commit is contained in:
Fernando Jiménez Moreno 2019-01-14 22:32:12 +01:00
parent 4e286ffa96
commit fde7d4589f
3 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
components/script/dom/htmlvideoelement.rs
View file

@ -2,6 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
use crate::document_loader::{LoadBlocker, LoadType};
use crate::dom::attr::Attr; use crate::dom::attr::Attr;
use crate::dom::bindings::cell::DomRefCell; use crate::dom::bindings::cell::DomRefCell;
use crate::dom::bindings::codegen::Bindings::HTMLVideoElementBinding; use crate::dom::bindings::codegen::Bindings::HTMLVideoElementBinding;
@ -51,6 +52,9 @@ pub struct HTMLVideoElement {
generation_id: Cell<u32>, generation_id: Cell<u32>,
/// Poster frame fetch request canceller. /// Poster frame fetch request canceller.
poster_frame_canceller: DomRefCell<FetchCanceller>, poster_frame_canceller: DomRefCell<FetchCanceller>,
/// Load event blocker. Will block the load event while the poster frame
/// is being fetched.
load_blocker: DomRefCell<Option<LoadBlocker>>,
} }
impl HTMLVideoElement { impl HTMLVideoElement {
@ -65,6 +69,7 @@ impl HTMLVideoElement {
video_height: Cell::new(DEFAULT_HEIGHT), video_height: Cell::new(DEFAULT_HEIGHT),
generation_id: Cell::new(0), generation_id: Cell::new(0),
poster_frame_canceller: DomRefCell::new(Default::default()), poster_frame_canceller: DomRefCell::new(Default::default()),
load_blocker: Default::default(),
} }
} }
@ -99,6 +104,10 @@ impl HTMLVideoElement {
self.video_height.set(height); self.video_height.set(height);
} }
pub fn allow_load_event(&self) {
LoadBlocker::terminate(&mut *self.load_blocker.borrow_mut());
}
/// https://html.spec.whatwg.org/multipage/#poster-frame /// https://html.spec.whatwg.org/multipage/#poster-frame
fn fetch_poster_frame(&self, poster_url: &str) { fn fetch_poster_frame(&self, poster_url: &str) {
// Step 1. // Step 1.
@ -164,7 +173,16 @@ impl HTMLVideoElement {
}; };
// Step 5. // Step 5.
self.htmlmediaelement.delay_load_event(true); // This delay must be independent from the ones created by HTMLMediaElement during
// its media load algorithm, otherwise a code like
// <video poster="poster.png"></video>
// (which triggers no media load algorithm unless a explicit call to .load() is done)
// will block the document's load event forever.
let mut blocker = self.load_blocker.borrow_mut();
*blocker = Some(LoadBlocker::new(
&document_from_node(self),
LoadType::Image(poster_url.clone()),
));
let window = window_from_node(self); let window = window_from_node(self);
let context = Arc::new(Mutex::new(PosterFrameFetchContext::new( let context = Arc::new(Mutex::new(PosterFrameFetchContext::new(
@ -308,6 +326,7 @@ impl FetchResponseListener for PosterFrameFetchContext {
} }
fn process_response_eof(&mut self, response: Result<ResourceFetchTiming, NetworkError>) { fn process_response_eof(&mut self, response: Result<ResourceFetchTiming, NetworkError>) {
self.elem.root().allow_load_event();
self.image_cache self.image_cache
.notify_pending_response(self.id, FetchResponseMsg::ProcessResponseEOF(response)); .notify_pending_response(self.id, FetchResponseMsg::ProcessResponseEOF(response));
} }

2
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -32838,7 +32838,7 @@
"testharness" "testharness"
], ],
"mozilla/video_poster_frame.html": [ "mozilla/video_poster_frame.html": [
"8b321ef5d82e0de6e16625ecd41190abc00bacb6", "8e85bcd62303b70153f8d451a843cb2bdd96484d",
"reftest" "reftest"
], ],
"mozilla/video_poster_frame_ref.html": [ "mozilla/video_poster_frame_ref.html": [

7
tests/wpt/mozilla/tests/mozilla/video_poster_frame.html
View file

@ -6,15 +6,10 @@
<link rel="match" href="video_poster_frame_ref.html"> <link rel="match" href="video_poster_frame_ref.html">
</head> </head>
<body> <body>
<video src="" poster="poster.png"></video> <video poster="poster.png"></video>
<script> <script>
let video = document.querySelector("video"); let video = document.querySelector("video");
video.addEventListener("postershown", function() { video.addEventListener("postershown", function() {
// Apart from removing the `reftest-wait` class we need to get
// the `load` event to signal that it's ok to take the reftest
// screenshot. Video loading delays the document `load` event,
// so we garantee that we get this event by setting an invalid
// src attribute to the video tag.
document.documentElement.classList.remove("reftest-wait"); document.documentElement.classList.remove("reftest-wait");
}); });
</script> </script>