diff options
Diffstat (limited to 'components/script/dom/htmlmediaelement.rs')
-rw-r--r-- | components/script/dom/htmlmediaelement.rs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index aeba3794310..c6b9c8a7939 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -65,7 +65,7 @@ use ipc_channel::router::ROUTER; use mime::{self, Mime}; use net_traits::image::base::Image; use net_traits::image_cache::ImageResponse; -use net_traits::request::{CredentialsMode, Destination, RequestBuilder}; +use net_traits::request::{CredentialsMode, Destination, Referrer, RequestBuilder}; use net_traits::{CoreResourceMsg, FetchChannels, FetchMetadata, FetchResponseListener, Metadata}; use net_traits::{NetworkError, ResourceFetchTiming, ResourceTimingType}; use script_layout_interface::HTMLMediaData; @@ -721,7 +721,7 @@ impl HTMLMediaElement { .use_url_credentials(true) .origin(document.origin().immutable().clone()) .pipeline_id(Some(self.global().pipeline_id())) - .referrer_url(Some(document.url())) + .referrer(Some(Referrer::ReferrerUrl(document.url()))) .referrer_policy(document.get_referrer_policy()); let mut current_fetch_context = self.current_fetch_context.borrow_mut(); @@ -1301,7 +1301,8 @@ impl HTMLMediaElement { } } }, - PlayerEvent::Error => { + PlayerEvent::Error(ref error) => { + error!("Player error: {:?}", error); self.error.set(Some(&*MediaError::new( &*window_from_node(self), MEDIA_ERR_DECODE, @@ -1548,17 +1549,11 @@ enum PlaybackDirection { // XXX Placeholder implementations for: // // - https://github.com/servo/servo/issues/22293 -// - https://github.com/servo/servo/issues/22321 impl HTMLMediaElement { // https://github.com/servo/servo/issues/22293 fn direction_of_playback(&self) -> PlaybackDirection { PlaybackDirection::Forwards } - - // https://github.com/servo/servo/pull/22321 - fn Loop(&self) -> bool { - false - } } impl Drop for HTMLMediaElement { @@ -1587,6 +1582,11 @@ impl HTMLMediaElementMethods for HTMLMediaElement { // https://html.spec.whatwg.org/multipage/#dom-media-autoplay make_bool_setter!(SetAutoplay, "autoplay"); + // https://html.spec.whatwg.org/multipage/#attr-media-loop + make_bool_getter!(Loop, "loop"); + // https://html.spec.whatwg.org/multipage/#attr-media-loop + make_bool_setter!(SetLoop, "loop"); + // https://html.spec.whatwg.org/multipage/#dom-media-defaultmuted make_bool_getter!(DefaultMuted, "muted"); // https://html.spec.whatwg.org/multipage/#dom-media-defaultmuted @@ -2012,7 +2012,7 @@ impl VirtualMethods for HTMLMediaElement { fn unbind_from_tree(&self, context: &UnbindContext) { self.super_type().unwrap().unbind_from_tree(context); - if context.tree_in_doc { + if context.tree_connected { let task = MediaElementMicrotask::PauseIfNotInDocumentTask { elem: DomRoot::from_ref(self), }; @@ -2064,7 +2064,7 @@ impl MicrotaskRunnable for MediaElementMicrotask { } }, &MediaElementMicrotask::PauseIfNotInDocumentTask { ref elem } => { - if !elem.upcast::<Node>().is_in_doc() { + if !elem.upcast::<Node>().is_connected() { elem.internal_pause_steps(); } }, |