diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs
index 8b10899c079..4e86aad0af3 100644
--- a/components/script/dom/htmlmediaelement.rs
+++ b/components/script/dom/htmlmediaelement.rs
@@ -2,10 +2,15 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+use dom::attr::Attr;
+use dom::bindings::cell::DOMRefCell;
use dom::bindings::codegen::Bindings::HTMLMediaElementBinding::HTMLMediaElementMethods;
use dom::bindings::codegen::Bindings::HTMLMediaElementBinding::HTMLMediaElementConstants;
+use dom::bindings::inheritance::Castable;
use dom::document::Document;
+use dom::element::AttributeMutation;
use dom::htmlelement::HTMLElement;
+use dom::virtualmethods::VirtualMethods;
use std::cell::Cell;
use string_cache::Atom;
use util::str::DOMString;
@@ -15,6 +20,7 @@ pub struct HTMLMediaElement {
htmlelement: HTMLElement,
network_state: Cell,
ready_state: Cell,
+ current_src: DOMRefCell,
}
impl HTMLMediaElement {
@@ -26,6 +32,7 @@ impl HTMLMediaElement {
HTMLElement::new_inherited(tag_name, prefix, document),
network_state: Cell::new(HTMLMediaElementConstants::NETWORK_EMPTY),
ready_state: Cell::new(HTMLMediaElementConstants::HAVE_NOTHING),
+ current_src: DOMRefCell::new("".to_owned()),
}
}
@@ -33,6 +40,9 @@ impl HTMLMediaElement {
pub fn htmlelement(&self) -> &HTMLElement {
&self.htmlelement
}
+
+ fn media_element_load_algorithm(&self, _src: &str) {
+ }
}
impl HTMLMediaElementMethods for HTMLMediaElement {
@@ -43,4 +53,33 @@ impl HTMLMediaElementMethods for HTMLMediaElement {
fn ReadyState(&self) -> u16 {
self.ready_state.get()
}
+
+ // https://html.spec.whatwg.org/multipage/#dom-media-src
+ make_url_getter!(Src, "src");
+ // https://html.spec.whatwg.org/multipage/#dom-media-src
+ make_setter!(SetSrc, "src");
+
+ // https://html.spec.whatwg.org/multipage/#dom-media-currentsrc
+ fn CurrentSrc(&self) -> DOMString {
+ DOMString::from(self.current_src.borrow().clone())
+ }
+}
+
+impl VirtualMethods for HTMLMediaElement {
+ fn super_type(&self) -> Option<&VirtualMethods> {
+ Some(self.upcast::() as &VirtualMethods)
+ }
+
+ fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
+ self.super_type().unwrap().attribute_mutated(attr, mutation);
+
+ match attr.local_name() {
+ &atom!("src") => {
+ if let Some(value) = mutation.new_value(attr) {
+ self.media_element_load_algorithm(&value);
+ }
+ }
+ _ => (),
+ };
+ }
}
diff --git a/components/script/dom/virtualmethods.rs b/components/script/dom/virtualmethods.rs
index e3def582ae4..cb62947c207 100644
--- a/components/script/dom/virtualmethods.rs
+++ b/components/script/dom/virtualmethods.rs
@@ -29,6 +29,7 @@ use dom::htmlimageelement::HTMLImageElement;
use dom::htmlinputelement::HTMLInputElement;
use dom::htmllabelelement::HTMLLabelElement;
use dom::htmllinkelement::HTMLLinkElement;
+use dom::htmlmediaelement::HTMLMediaElement;
use dom::htmlmetaelement::HTMLMetaElement;
use dom::htmlobjectelement::HTMLObjectElement;
use dom::htmloptgroupelement::HTMLOptGroupElement;
@@ -181,6 +182,9 @@ pub fn vtable_for(node: &Node) -> &VirtualMethods {
NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLLinkElement)) => {
node.downcast::().unwrap() as &VirtualMethods
}
+ NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLMediaElement(_))) => {
+ node.downcast::().unwrap() as &VirtualMethods
+ }
NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLMetaElement)) => {
node.downcast::().unwrap() as &VirtualMethods
}
diff --git a/components/script/dom/webidls/HTMLMediaElement.webidl b/components/script/dom/webidls/HTMLMediaElement.webidl
index 728cf0a53df..5515618d6a9 100644
--- a/components/script/dom/webidls/HTMLMediaElement.webidl
+++ b/components/script/dom/webidls/HTMLMediaElement.webidl
@@ -11,8 +11,8 @@ interface HTMLMediaElement : HTMLElement {
//readonly attribute MediaError? error;
// network state
- // attribute DOMString src;
- //readonly attribute DOMString currentSrc;
+ attribute DOMString src;
+ readonly attribute DOMString currentSrc;
// attribute DOMString crossOrigin;
const unsigned short NETWORK_EMPTY = 0;
const unsigned short NETWORK_IDLE = 1;
diff --git a/tests/wpt/metadata/html/dom/interfaces.html.ini b/tests/wpt/metadata/html/dom/interfaces.html.ini
index 7f3977671e0..02218fc7498 100644
--- a/tests/wpt/metadata/html/dom/interfaces.html.ini
+++ b/tests/wpt/metadata/html/dom/interfaces.html.ini
@@ -2622,12 +2622,6 @@
[HTMLMediaElement interface: document.createElement("video") must inherit property "error" with the proper type (0)]
expected: FAIL
- [HTMLMediaElement interface: document.createElement("video") must inherit property "src" with the proper type (1)]
- expected: FAIL
-
- [HTMLMediaElement interface: document.createElement("video") must inherit property "currentSrc" with the proper type (2)]
- expected: FAIL
-
[HTMLMediaElement interface: document.createElement("video") must inherit property "crossOrigin" with the proper type (3)]
expected: FAIL
@@ -2730,12 +2724,6 @@
[HTMLMediaElement interface: document.createElement("audio") must inherit property "error" with the proper type (0)]
expected: FAIL
- [HTMLMediaElement interface: document.createElement("audio") must inherit property "src" with the proper type (1)]
- expected: FAIL
-
- [HTMLMediaElement interface: document.createElement("audio") must inherit property "currentSrc" with the proper type (2)]
- expected: FAIL
-
[HTMLMediaElement interface: document.createElement("audio") must inherit property "crossOrigin" with the proper type (3)]
expected: FAIL
@@ -3093,12 +3081,6 @@
[HTMLMediaElement interface: attribute error]
expected: FAIL
- [HTMLMediaElement interface: attribute src]
- expected: FAIL
-
- [HTMLMediaElement interface: attribute currentSrc]
- expected: FAIL
-
[HTMLMediaElement interface: attribute crossOrigin]
expected: FAIL
diff --git a/tests/wpt/metadata/html/dom/reflection-embedded.html.ini b/tests/wpt/metadata/html/dom/reflection-embedded.html.ini
index 94df1baae7b..f3c8293fffc 100644
--- a/tests/wpt/metadata/html/dom/reflection-embedded.html.ini
+++ b/tests/wpt/metadata/html/dom/reflection-embedded.html.ini
@@ -9429,168 +9429,6 @@
[video.tabIndex: IDL set to -2147483648 followed by getAttribute()]
expected: FAIL
- [video.src: typeof IDL attribute]
- expected: FAIL
-
- [video.src: IDL get with DOM attribute unset]
- expected: FAIL
-
- [video.src: setAttribute() to "" followed by IDL get]
- expected: FAIL
-
- [video.src: setAttribute() to " foo " followed by IDL get]
- expected: FAIL
-
- [video.src: setAttribute() to "http://site.example/" followed by IDL get]
- expected: FAIL
-
- [video.src: setAttribute() to "//site.example/path???@#l" followed by IDL get]
- expected: FAIL
-
- [video.src: setAttribute() to "\\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07 \\b\\t\\n\\v\\f\\r\\x0e\\x0f \\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17 \\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f " followed by IDL get]
- expected: FAIL
-
- [video.src: setAttribute() to undefined followed by IDL get]
- expected: FAIL
-
- [video.src: setAttribute() to 7 followed by IDL get]
- expected: FAIL
-
- [video.src: setAttribute() to 1.5 followed by IDL get]
- expected: FAIL
-
- [video.src: setAttribute() to true followed by IDL get]
- expected: FAIL
-
- [video.src: setAttribute() to false followed by IDL get]
- expected: FAIL
-
- [video.src: setAttribute() to object "[object Object\]" followed by IDL get]
- expected: FAIL
-
- [video.src: setAttribute() to NaN followed by IDL get]
- expected: FAIL
-
- [video.src: setAttribute() to Infinity followed by IDL get]
- expected: FAIL
-
- [video.src: setAttribute() to -Infinity followed by IDL get]
- expected: FAIL
-
- [video.src: setAttribute() to "\\0" followed by IDL get]
- expected: FAIL
-
- [video.src: setAttribute() to null followed by IDL get]
- expected: FAIL
-
- [video.src: setAttribute() to object "test-toString" followed by IDL get]
- expected: FAIL
-
- [video.src: setAttribute() to object "test-valueOf" followed by IDL get]
- expected: FAIL
-
- [video.src: IDL set to "" followed by getAttribute()]
- expected: FAIL
-
- [video.src: IDL set to "" followed by IDL get]
- expected: FAIL
-
- [video.src: IDL set to " foo " followed by getAttribute()]
- expected: FAIL
-
- [video.src: IDL set to " foo " followed by IDL get]
- expected: FAIL
-
- [video.src: IDL set to "http://site.example/" followed by getAttribute()]
- expected: FAIL
-
- [video.src: IDL set to "//site.example/path???@#l" followed by getAttribute()]
- expected: FAIL
-
- [video.src: IDL set to "//site.example/path???@#l" followed by IDL get]
- expected: FAIL
-
- [video.src: IDL set to "\\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07 \\b\\t\\n\\v\\f\\r\\x0e\\x0f \\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17 \\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f " followed by getAttribute()]
- expected: FAIL
-
- [video.src: IDL set to "\\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07 \\b\\t\\n\\v\\f\\r\\x0e\\x0f \\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17 \\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f " followed by IDL get]
- expected: FAIL
-
- [video.src: IDL set to undefined followed by getAttribute()]
- expected: FAIL
-
- [video.src: IDL set to undefined followed by IDL get]
- expected: FAIL
-
- [video.src: IDL set to 7 followed by getAttribute()]
- expected: FAIL
-
- [video.src: IDL set to 7 followed by IDL get]
- expected: FAIL
-
- [video.src: IDL set to 1.5 followed by getAttribute()]
- expected: FAIL
-
- [video.src: IDL set to 1.5 followed by IDL get]
- expected: FAIL
-
- [video.src: IDL set to true followed by getAttribute()]
- expected: FAIL
-
- [video.src: IDL set to true followed by IDL get]
- expected: FAIL
-
- [video.src: IDL set to false followed by getAttribute()]
- expected: FAIL
-
- [video.src: IDL set to false followed by IDL get]
- expected: FAIL
-
- [video.src: IDL set to object "[object Object\]" followed by getAttribute()]
- expected: FAIL
-
- [video.src: IDL set to object "[object Object\]" followed by IDL get]
- expected: FAIL
-
- [video.src: IDL set to NaN followed by getAttribute()]
- expected: FAIL
-
- [video.src: IDL set to NaN followed by IDL get]
- expected: FAIL
-
- [video.src: IDL set to Infinity followed by getAttribute()]
- expected: FAIL
-
- [video.src: IDL set to Infinity followed by IDL get]
- expected: FAIL
-
- [video.src: IDL set to -Infinity followed by getAttribute()]
- expected: FAIL
-
- [video.src: IDL set to -Infinity followed by IDL get]
- expected: FAIL
-
- [video.src: IDL set to "\\0" followed by getAttribute()]
- expected: FAIL
-
- [video.src: IDL set to "\\0" followed by IDL get]
- expected: FAIL
-
- [video.src: IDL set to null followed by getAttribute()]
- expected: FAIL
-
- [video.src: IDL set to null followed by IDL get]
- expected: FAIL
-
- [video.src: IDL set to object "test-toString" followed by getAttribute()]
- expected: FAIL
-
- [video.src: IDL set to object "test-toString" followed by IDL get]
- expected: FAIL
-
- [video.src: IDL set to object "test-valueOf" followed by IDL get]
- expected: FAIL
-
[video.crossOrigin: typeof IDL attribute]
expected: FAIL
@@ -11739,168 +11577,6 @@
[audio.tabIndex: IDL set to -2147483648 followed by getAttribute()]
expected: FAIL
- [audio.src: typeof IDL attribute]
- expected: FAIL
-
- [audio.src: IDL get with DOM attribute unset]
- expected: FAIL
-
- [audio.src: setAttribute() to "" followed by IDL get]
- expected: FAIL
-
- [audio.src: setAttribute() to " foo " followed by IDL get]
- expected: FAIL
-
- [audio.src: setAttribute() to "http://site.example/" followed by IDL get]
- expected: FAIL
-
- [audio.src: setAttribute() to "//site.example/path???@#l" followed by IDL get]
- expected: FAIL
-
- [audio.src: setAttribute() to "\\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07 \\b\\t\\n\\v\\f\\r\\x0e\\x0f \\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17 \\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f " followed by IDL get]
- expected: FAIL
-
- [audio.src: setAttribute() to undefined followed by IDL get]
- expected: FAIL
-
- [audio.src: setAttribute() to 7 followed by IDL get]
- expected: FAIL
-
- [audio.src: setAttribute() to 1.5 followed by IDL get]
- expected: FAIL
-
- [audio.src: setAttribute() to true followed by IDL get]
- expected: FAIL
-
- [audio.src: setAttribute() to false followed by IDL get]
- expected: FAIL
-
- [audio.src: setAttribute() to object "[object Object\]" followed by IDL get]
- expected: FAIL
-
- [audio.src: setAttribute() to NaN followed by IDL get]
- expected: FAIL
-
- [audio.src: setAttribute() to Infinity followed by IDL get]
- expected: FAIL
-
- [audio.src: setAttribute() to -Infinity followed by IDL get]
- expected: FAIL
-
- [audio.src: setAttribute() to "\\0" followed by IDL get]
- expected: FAIL
-
- [audio.src: setAttribute() to null followed by IDL get]
- expected: FAIL
-
- [audio.src: setAttribute() to object "test-toString" followed by IDL get]
- expected: FAIL
-
- [audio.src: setAttribute() to object "test-valueOf" followed by IDL get]
- expected: FAIL
-
- [audio.src: IDL set to "" followed by getAttribute()]
- expected: FAIL
-
- [audio.src: IDL set to "" followed by IDL get]
- expected: FAIL
-
- [audio.src: IDL set to " foo " followed by getAttribute()]
- expected: FAIL
-
- [audio.src: IDL set to " foo " followed by IDL get]
- expected: FAIL
-
- [audio.src: IDL set to "http://site.example/" followed by getAttribute()]
- expected: FAIL
-
- [audio.src: IDL set to "//site.example/path???@#l" followed by getAttribute()]
- expected: FAIL
-
- [audio.src: IDL set to "//site.example/path???@#l" followed by IDL get]
- expected: FAIL
-
- [audio.src: IDL set to "\\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07 \\b\\t\\n\\v\\f\\r\\x0e\\x0f \\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17 \\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f " followed by getAttribute()]
- expected: FAIL
-
- [audio.src: IDL set to "\\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07 \\b\\t\\n\\v\\f\\r\\x0e\\x0f \\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17 \\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f " followed by IDL get]
- expected: FAIL
-
- [audio.src: IDL set to undefined followed by getAttribute()]
- expected: FAIL
-
- [audio.src: IDL set to undefined followed by IDL get]
- expected: FAIL
-
- [audio.src: IDL set to 7 followed by getAttribute()]
- expected: FAIL
-
- [audio.src: IDL set to 7 followed by IDL get]
- expected: FAIL
-
- [audio.src: IDL set to 1.5 followed by getAttribute()]
- expected: FAIL
-
- [audio.src: IDL set to 1.5 followed by IDL get]
- expected: FAIL
-
- [audio.src: IDL set to true followed by getAttribute()]
- expected: FAIL
-
- [audio.src: IDL set to true followed by IDL get]
- expected: FAIL
-
- [audio.src: IDL set to false followed by getAttribute()]
- expected: FAIL
-
- [audio.src: IDL set to false followed by IDL get]
- expected: FAIL
-
- [audio.src: IDL set to object "[object Object\]" followed by getAttribute()]
- expected: FAIL
-
- [audio.src: IDL set to object "[object Object\]" followed by IDL get]
- expected: FAIL
-
- [audio.src: IDL set to NaN followed by getAttribute()]
- expected: FAIL
-
- [audio.src: IDL set to NaN followed by IDL get]
- expected: FAIL
-
- [audio.src: IDL set to Infinity followed by getAttribute()]
- expected: FAIL
-
- [audio.src: IDL set to Infinity followed by IDL get]
- expected: FAIL
-
- [audio.src: IDL set to -Infinity followed by getAttribute()]
- expected: FAIL
-
- [audio.src: IDL set to -Infinity followed by IDL get]
- expected: FAIL
-
- [audio.src: IDL set to "\\0" followed by getAttribute()]
- expected: FAIL
-
- [audio.src: IDL set to "\\0" followed by IDL get]
- expected: FAIL
-
- [audio.src: IDL set to null followed by getAttribute()]
- expected: FAIL
-
- [audio.src: IDL set to null followed by IDL get]
- expected: FAIL
-
- [audio.src: IDL set to object "test-toString" followed by getAttribute()]
- expected: FAIL
-
- [audio.src: IDL set to object "test-toString" followed by IDL get]
- expected: FAIL
-
- [audio.src: IDL set to object "test-valueOf" followed by IDL get]
- expected: FAIL
-
[audio.crossOrigin: typeof IDL attribute]
expected: FAIL