diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs
index db2fef3a821..739025544e7 100644
--- a/components/script/dom/htmlmediaelement.rs
+++ b/components/script/dom/htmlmediaelement.rs
@@ -20,6 +20,7 @@ use dom::bindings::refcounted::Trusted;
use dom::bindings::reflector::DomObject;
use dom::bindings::root::{DomRoot, MutNullableDom};
use dom::bindings::str::DOMString;
+use dom::blob::Blob;
use dom::document::Document;
use dom::element::{Element, AttributeMutation};
use dom::eventtarget::EventTarget;
@@ -57,6 +58,8 @@ pub struct HTMLMediaElement {
network_state: Cell,
/// https://html.spec.whatwg.org/multipage/#dom-media-readystate
ready_state: Cell,
+ /// https://html.spec.whatwg.org/multipage/#dom-media-srcobject
+ src_object: MutNullableDom,
/// https://html.spec.whatwg.org/multipage/#dom-media-currentsrc
current_src: DomRefCell,
/// Incremented whenever tasks associated with this element are cancelled.
@@ -112,6 +115,7 @@ impl HTMLMediaElement {
htmlelement: HTMLElement::new_inherited(tag_name, prefix, document),
network_state: Cell::new(NetworkState::Empty),
ready_state: Cell::new(ReadyState::HaveNothing),
+ src_object: Default::default(),
current_src: DomRefCell::new("".to_owned()),
generation_id: Cell::new(0),
fired_loadeddata_event: Cell::new(false),
@@ -448,13 +452,14 @@ impl HTMLMediaElement {
// Step 6.
enum Mode {
- // FIXME(nox): Support media object provider.
- #[allow(dead_code)]
Object,
Attribute(String),
Children(DomRoot),
}
fn mode(media: &HTMLMediaElement) -> Option {
+ if media.src_object.get().is_some() {
+ return Some(Mode::Object);
+ }
if let Some(attr) = media.upcast::().get_attribute(&ns!(), &local_name!("src")) {
return Some(Mode::Attribute(attr.Value().into()));
}
@@ -500,7 +505,6 @@ impl HTMLMediaElement {
// Step 9.obj.3.
// Note that the resource fetch algorithm itself takes care
// of the cleanup in case of failure itself.
- // FIXME(nox): Pass the assigned media provider here.
self.resource_fetch_algorithm(Resource::Object);
},
Mode::Attribute(src) => {
@@ -613,7 +617,7 @@ impl HTMLMediaElement {
document.loader().fetch_async_background(request, action_sender);
},
Resource::Object => {
- // FIXME(nox): Use the current media resource.
+ // FIXME(nox): Actually do something with the object.
self.queue_dedicated_media_source_failure_steps();
},
}
@@ -836,6 +840,17 @@ impl HTMLMediaElementMethods for HTMLMediaElement {
// https://html.spec.whatwg.org/multipage/#dom-media-src
make_setter!(SetSrc, "src");
+ // https://html.spec.whatwg.org/multipage/#dom-media-srcobject
+ fn GetSrcObject(&self) -> Option> {
+ self.src_object.get()
+ }
+
+ // https://html.spec.whatwg.org/multipage/#dom-media-srcobject
+ fn SetSrcObject(&self, value: Option<&Blob>) {
+ self.src_object.set(value);
+ self.media_element_load_algorithm();
+ }
+
// https://html.spec.whatwg.org/multipage/#attr-media-preload
// Missing value default is user-agent defined.
make_enumerated_getter!(Preload, "preload", "", "none" | "metadata" | "auto");
diff --git a/components/script/dom/webidls/HTMLMediaElement.webidl b/components/script/dom/webidls/HTMLMediaElement.webidl
index 5b142780aa1..b67a5e3c1fe 100644
--- a/components/script/dom/webidls/HTMLMediaElement.webidl
+++ b/components/script/dom/webidls/HTMLMediaElement.webidl
@@ -5,6 +5,7 @@
// https://html.spec.whatwg.org/multipage/#htmlmediaelement
enum CanPlayTypeResult { "" /* empty string */, "maybe", "probably" };
+typedef /* (MediaStream or MediaSource or */ Blob /* ) */ MediaProvider;
[Abstract]
interface HTMLMediaElement : HTMLElement {
@@ -13,7 +14,7 @@ interface HTMLMediaElement : HTMLElement {
// network state
[CEReactions] attribute DOMString src;
- // attribute MediaProvider? srcObject;
+ attribute MediaProvider? srcObject;
readonly attribute DOMString currentSrc;
// [CEReactions] attribute DOMString crossOrigin;
const unsigned short NETWORK_EMPTY = 0;