From b8b4be34c0736da58ec99c471ede135b715635fd Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 6 Nov 2015 16:28:31 -0600 Subject: [PATCH 01/13] Stub out readyState and networkState attributes for HTMLMediaElement. --- components/script/dom/htmlmediaelement.rs | 19 ++- .../dom/webidls/HTMLMediaElement.webidl | 22 +-- .../wpt/metadata/html/dom/interfaces.html.ini | 126 ------------------ 3 files changed, 29 insertions(+), 138 deletions(-) diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index 7b21703341d..8b10899c079 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -2,14 +2,19 @@ * 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::bindings::codegen::Bindings::HTMLMediaElementBinding::HTMLMediaElementMethods; +use dom::bindings::codegen::Bindings::HTMLMediaElementBinding::HTMLMediaElementConstants; use dom::document::Document; use dom::htmlelement::HTMLElement; +use std::cell::Cell; use string_cache::Atom; use util::str::DOMString; #[dom_struct] pub struct HTMLMediaElement { htmlelement: HTMLElement, + network_state: Cell, + ready_state: Cell, } impl HTMLMediaElement { @@ -18,7 +23,9 @@ impl HTMLMediaElement { -> HTMLMediaElement { HTMLMediaElement { htmlelement: - HTMLElement::new_inherited(tag_name, prefix, document) + HTMLElement::new_inherited(tag_name, prefix, document), + network_state: Cell::new(HTMLMediaElementConstants::NETWORK_EMPTY), + ready_state: Cell::new(HTMLMediaElementConstants::HAVE_NOTHING), } } @@ -27,3 +34,13 @@ impl HTMLMediaElement { &self.htmlelement } } + +impl HTMLMediaElementMethods for HTMLMediaElement { + fn NetworkState(&self) -> u16 { + self.network_state.get() + } + + fn ReadyState(&self) -> u16 { + self.ready_state.get() + } +} diff --git a/components/script/dom/webidls/HTMLMediaElement.webidl b/components/script/dom/webidls/HTMLMediaElement.webidl index 277178732c7..728cf0a53df 100644 --- a/components/script/dom/webidls/HTMLMediaElement.webidl +++ b/components/script/dom/webidls/HTMLMediaElement.webidl @@ -14,23 +14,23 @@ interface HTMLMediaElement : HTMLElement { // attribute DOMString src; //readonly attribute DOMString currentSrc; // attribute DOMString crossOrigin; - //const unsigned short NETWORK_EMPTY = 0; - //const unsigned short NETWORK_IDLE = 1; - //const unsigned short NETWORK_LOADING = 2; - //const unsigned short NETWORK_NO_SOURCE = 3; - //readonly attribute unsigned short networkState; + const unsigned short NETWORK_EMPTY = 0; + const unsigned short NETWORK_IDLE = 1; + const unsigned short NETWORK_LOADING = 2; + const unsigned short NETWORK_NO_SOURCE = 3; + readonly attribute unsigned short networkState; // attribute DOMString preload; //readonly attribute TimeRanges buffered; //void load(); //CanPlayTypeResult canPlayType(DOMString type); // ready state - //const unsigned short HAVE_NOTHING = 0; - //const unsigned short HAVE_METADATA = 1; - //const unsigned short HAVE_CURRENT_DATA = 2; - //const unsigned short HAVE_FUTURE_DATA = 3; - //const unsigned short HAVE_ENOUGH_DATA = 4; - //readonly attribute unsigned short readyState; + const unsigned short HAVE_NOTHING = 0; + const unsigned short HAVE_METADATA = 1; + const unsigned short HAVE_CURRENT_DATA = 2; + const unsigned short HAVE_FUTURE_DATA = 3; + const unsigned short HAVE_ENOUGH_DATA = 4; + readonly attribute unsigned short readyState; //readonly attribute boolean seeking; // playback state diff --git a/tests/wpt/metadata/html/dom/interfaces.html.ini b/tests/wpt/metadata/html/dom/interfaces.html.ini index 1acedab90ec..7f3977671e0 100644 --- a/tests/wpt/metadata/html/dom/interfaces.html.ini +++ b/tests/wpt/metadata/html/dom/interfaces.html.ini @@ -2631,21 +2631,6 @@ [HTMLMediaElement interface: document.createElement("video") must inherit property "crossOrigin" with the proper type (3)] expected: FAIL - [HTMLMediaElement interface: document.createElement("video") must inherit property "NETWORK_EMPTY" with the proper type (4)] - expected: FAIL - - [HTMLMediaElement interface: document.createElement("video") must inherit property "NETWORK_IDLE" with the proper type (5)] - expected: FAIL - - [HTMLMediaElement interface: document.createElement("video") must inherit property "NETWORK_LOADING" with the proper type (6)] - expected: FAIL - - [HTMLMediaElement interface: document.createElement("video") must inherit property "NETWORK_NO_SOURCE" with the proper type (7)] - expected: FAIL - - [HTMLMediaElement interface: document.createElement("video") must inherit property "networkState" with the proper type (8)] - expected: FAIL - [HTMLMediaElement interface: document.createElement("video") must inherit property "preload" with the proper type (9)] expected: FAIL @@ -2661,24 +2646,6 @@ [HTMLMediaElement interface: calling canPlayType(DOMString) on document.createElement("video") with too few arguments must throw TypeError] expected: FAIL - [HTMLMediaElement interface: document.createElement("video") must inherit property "HAVE_NOTHING" with the proper type (13)] - expected: FAIL - - [HTMLMediaElement interface: document.createElement("video") must inherit property "HAVE_METADATA" with the proper type (14)] - expected: FAIL - - [HTMLMediaElement interface: document.createElement("video") must inherit property "HAVE_CURRENT_DATA" with the proper type (15)] - expected: FAIL - - [HTMLMediaElement interface: document.createElement("video") must inherit property "HAVE_FUTURE_DATA" with the proper type (16)] - expected: FAIL - - [HTMLMediaElement interface: document.createElement("video") must inherit property "HAVE_ENOUGH_DATA" with the proper type (17)] - expected: FAIL - - [HTMLMediaElement interface: document.createElement("video") must inherit property "readyState" with the proper type (18)] - expected: FAIL - [HTMLMediaElement interface: document.createElement("video") must inherit property "seeking" with the proper type (19)] expected: FAIL @@ -2772,21 +2739,6 @@ [HTMLMediaElement interface: document.createElement("audio") must inherit property "crossOrigin" with the proper type (3)] expected: FAIL - [HTMLMediaElement interface: document.createElement("audio") must inherit property "NETWORK_EMPTY" with the proper type (4)] - expected: FAIL - - [HTMLMediaElement interface: document.createElement("audio") must inherit property "NETWORK_IDLE" with the proper type (5)] - expected: FAIL - - [HTMLMediaElement interface: document.createElement("audio") must inherit property "NETWORK_LOADING" with the proper type (6)] - expected: FAIL - - [HTMLMediaElement interface: document.createElement("audio") must inherit property "NETWORK_NO_SOURCE" with the proper type (7)] - expected: FAIL - - [HTMLMediaElement interface: document.createElement("audio") must inherit property "networkState" with the proper type (8)] - expected: FAIL - [HTMLMediaElement interface: document.createElement("audio") must inherit property "preload" with the proper type (9)] expected: FAIL @@ -2802,24 +2754,6 @@ [HTMLMediaElement interface: calling canPlayType(DOMString) on document.createElement("audio") with too few arguments must throw TypeError] expected: FAIL - [HTMLMediaElement interface: document.createElement("audio") must inherit property "HAVE_NOTHING" with the proper type (13)] - expected: FAIL - - [HTMLMediaElement interface: document.createElement("audio") must inherit property "HAVE_METADATA" with the proper type (14)] - expected: FAIL - - [HTMLMediaElement interface: document.createElement("audio") must inherit property "HAVE_CURRENT_DATA" with the proper type (15)] - expected: FAIL - - [HTMLMediaElement interface: document.createElement("audio") must inherit property "HAVE_FUTURE_DATA" with the proper type (16)] - expected: FAIL - - [HTMLMediaElement interface: document.createElement("audio") must inherit property "HAVE_ENOUGH_DATA" with the proper type (17)] - expected: FAIL - - [HTMLMediaElement interface: document.createElement("audio") must inherit property "readyState" with the proper type (18)] - expected: FAIL - [HTMLMediaElement interface: document.createElement("audio") must inherit property "seeking" with the proper type (19)] expected: FAIL @@ -3168,33 +3102,6 @@ [HTMLMediaElement interface: attribute crossOrigin] expected: FAIL - [HTMLMediaElement interface: constant NETWORK_EMPTY on interface object] - expected: FAIL - - [HTMLMediaElement interface: constant NETWORK_EMPTY on interface prototype object] - expected: FAIL - - [HTMLMediaElement interface: constant NETWORK_IDLE on interface object] - expected: FAIL - - [HTMLMediaElement interface: constant NETWORK_IDLE on interface prototype object] - expected: FAIL - - [HTMLMediaElement interface: constant NETWORK_LOADING on interface object] - expected: FAIL - - [HTMLMediaElement interface: constant NETWORK_LOADING on interface prototype object] - expected: FAIL - - [HTMLMediaElement interface: constant NETWORK_NO_SOURCE on interface object] - expected: FAIL - - [HTMLMediaElement interface: constant NETWORK_NO_SOURCE on interface prototype object] - expected: FAIL - - [HTMLMediaElement interface: attribute networkState] - expected: FAIL - [HTMLMediaElement interface: attribute preload] expected: FAIL @@ -3207,39 +3114,6 @@ [HTMLMediaElement interface: operation canPlayType(DOMString)] expected: FAIL - [HTMLMediaElement interface: constant HAVE_NOTHING on interface object] - expected: FAIL - - [HTMLMediaElement interface: constant HAVE_NOTHING on interface prototype object] - expected: FAIL - - [HTMLMediaElement interface: constant HAVE_METADATA on interface object] - expected: FAIL - - [HTMLMediaElement interface: constant HAVE_METADATA on interface prototype object] - expected: FAIL - - [HTMLMediaElement interface: constant HAVE_CURRENT_DATA on interface object] - expected: FAIL - - [HTMLMediaElement interface: constant HAVE_CURRENT_DATA on interface prototype object] - expected: FAIL - - [HTMLMediaElement interface: constant HAVE_FUTURE_DATA on interface object] - expected: FAIL - - [HTMLMediaElement interface: constant HAVE_FUTURE_DATA on interface prototype object] - expected: FAIL - - [HTMLMediaElement interface: constant HAVE_ENOUGH_DATA on interface object] - expected: FAIL - - [HTMLMediaElement interface: constant HAVE_ENOUGH_DATA on interface prototype object] - expected: FAIL - - [HTMLMediaElement interface: attribute readyState] - expected: FAIL - [HTMLMediaElement interface: attribute seeking] expected: FAIL From 53f9307fb7a699749b0671cd476f01c0fd8268a4 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 6 Nov 2015 16:50:34 -0600 Subject: [PATCH 02/13] Add stubs for src and currentSrc for HTMLMediaElement. --- components/script/dom/htmlmediaelement.rs | 39 +++ components/script/dom/virtualmethods.rs | 4 + .../dom/webidls/HTMLMediaElement.webidl | 4 +- .../wpt/metadata/html/dom/interfaces.html.ini | 18 - .../html/dom/reflection-embedded.html.ini | 324 ------------------ 5 files changed, 45 insertions(+), 344 deletions(-) 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 From 5918954edd36d2eef5dd474348570685a1c8840d Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Thu, 28 Apr 2016 17:18:06 -0400 Subject: [PATCH 03/13] Add media tasks to the DOM manipulation task queue. --- components/script/task_source/dom_manipulation.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/components/script/task_source/dom_manipulation.rs b/components/script/task_source/dom_manipulation.rs index 9676ade6ded..5993825a1be 100644 --- a/components/script/task_source/dom_manipulation.rs +++ b/components/script/task_source/dom_manipulation.rs @@ -33,6 +33,8 @@ pub enum DOMManipulationTask { FireSimpleEvent(Atom, Trusted), // https://html.spec.whatwg.org/multipage/#details-notification-task-steps FireToggleEvent(Box), + // Placeholder until there's a real media element task queue implementation + MediaTask(Box), // https://html.spec.whatwg.org/multipage/#planned-navigation PlannedNavigation(Box), // https://html.spec.whatwg.org/multipage/#send-a-storage-notification @@ -54,6 +56,7 @@ impl DOMManipulationTask { target.fire_simple_event(&*name); } FireToggleEvent(runnable) => runnable.handler(), + MediaTask(runnable) => runnable.handler(), PlannedNavigation(runnable) => runnable.handler(), SendStorageNotification(runnable) => runnable.handler(script_thread) } From eae27adc4af727699338b67f648cac85233679ce Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 6 Nov 2015 22:43:11 -0600 Subject: [PATCH 04/13] Implement basic media resource selection and fetching. --- components/script/document_loader.rs | 5 +- components/script/dom/htmlmediaelement.rs | 475 +++++++++++++++++- components/script/script_thread.rs | 13 + .../media-elements/__dir__.ini | 1 - .../media-elements/audio_loop_base.html.ini | 6 + .../audio_volume_check.html.ini | 8 + .../media-elements/error-codes/error.html.ini | 21 + .../media-elements/event_loadeddata.html.ini | 9 + .../media-elements/event_pause.html.ini | 9 + .../event_pause_noautoplay.html.ini | 15 + .../media-elements/event_play.html.ini | 9 + .../event_play_noautoplay.html.ini | 15 + .../event_playing_noautoplay.html.ini | 8 + .../media-elements/event_timeupdate.html.ini | 9 + .../event_timeupdate_noautoplay.html.ini | 15 + .../event_volumechange.html.ini | 27 + .../media-elements/historical.html.ini | 5 + .../HTMLMediaElement/addTextTrack.html.ini | 29 ++ .../HTMLMediaElement/textTracks.html.ini | 5 + .../HTMLTrackElement/default.html.ini | 23 + .../HTMLTrackElement/kind.html.ini | 62 +++ .../HTMLTrackElement/label.html.ini | 35 ++ .../HTMLTrackElement/readyState.html.ini | 5 + .../HTMLElement/HTMLTrackElement/src.html.ini | 28 ++ .../HTMLTrackElement/srclang.html.ini | 35 ++ .../HTMLTrackElement/track.html.ini | 5 + .../interfaces/TextTrack/activeCues.html.ini | 21 + .../interfaces/TextTrack/addCue.html.ini | 17 + .../interfaces/TextTrack/constants.html.ini | 6 + .../interfaces/TextTrack/cues.html.ini | 17 + .../interfaces/TextTrack/kind.html.ini | 11 + .../interfaces/TextTrack/label.html.ini | 9 + .../interfaces/TextTrack/language.html.ini | 9 + .../interfaces/TextTrack/mode.html.ini | 8 + .../interfaces/TextTrack/oncuechange.html.ini | 9 + .../interfaces/TextTrack/removeCue.html.ini | 8 + .../interfaces/TextTrackCue/endTime.html.ini | 9 + .../interfaces/TextTrackCue/id.html.ini | 9 + .../interfaces/TextTrackCue/onenter.html.ini | 9 + .../interfaces/TextTrackCue/onexit.html.ini | 9 + .../TextTrackCue/pauseOnExit.html.ini | 9 + .../TextTrackCue/startTime.html.ini | 9 + .../interfaces/TextTrackCue/track.html.ini | 9 + .../TextTrackCueList/getCueById.html.ini | 14 + .../TextTrackCueList/getter.html.ini | 12 + .../TextTrackCueList/length.html.ini | 6 + .../TextTrackList/getTrackById.html.ini | 5 + .../interfaces/TextTrackList/getter.html.ini | 12 + .../interfaces/TextTrackList/length.html.ini | 6 + .../TextTrackList/onaddtrack.html.ini | 8 + .../TextTrackList/onremovetrack.html.ini | 8 + .../TrackEvent/constructor.html.ini | 8 + .../TrackEvent/createEvent.html.ini | 5 + .../autoplay-overrides-preload.html.ini | 14 + .../load-events-networkState.html.ini | 12 + .../load-removes-queued-error-event.html.ini | 9 + ...selection-candidate-insert-before.html.ini | 6 + ...esource-selection-candidate-moved.html.ini | 5 + ...candidate-remove-addEventListener.html.ini | 6 + ...election-candidate-remove-onerror.html.ini | 6 + ...n-invoke-audio-constructor-no-src.html.ini | 5 + ...election-invoke-audio-constructor.html.ini | 5 + ...ce-selection-invoke-in-sync-event.html.ini | 5 + ...lection-invoke-insert-into-iframe.html.ini | 6 + ...invoke-insert-source-networkState.html.ini | 5 + ...oke-insert-source-not-in-document.html.ini | 5 + ...ce-selection-invoke-insert-source.html.ini | 5 + .../resource-selection-invoke-load.html.ini | 5 + ...lection-invoke-pause-networkState.html.ini | 5 + .../resource-selection-invoke-pause.html.ini | 5 + .../resource-selection-invoke-play.html.ini | 5 + ...remove-from-document-networkState.html.ini | 5 + ...ction-invoke-set-src-networkState.html.ini | 5 + ...on-invoke-set-src-not-in-document.html.ini | 5 + ...resource-selection-invoke-set-src.html.ini | 5 + ...esource-selection-pointer-control.html.ini | 5 + ...ource-selection-pointer-insert-br.html.ini | 5 + ...e-selection-pointer-insert-source.html.ini | 5 + ...rce-selection-pointer-insert-text.html.ini | 5 + ...ction-pointer-remove-source-after.html.ini | 5 + ...e-selection-pointer-remove-source.html.ini | 5 + ...rce-selection-pointer-remove-text.html.ini | 5 + .../resource-selection-remove-source.html.ini | 5 + .../resource-selection-remove-src.html.ini | 5 + .../resource-selection-source-media.html.ini | 5 + .../currentSrc.html.ini | 20 + .../mime-types/canPlayType.html.ini | 152 ++++++ .../currentTime.html.ini | 15 + .../paused_false_during_play.html.ini | 9 + .../paused_true_during_pause.html.ini | 15 + .../pause-move-to-other-document.html.ini | 5 + .../pause-move-within-document.html.ini | 5 + ...remove-from-document-networkState.html.ini | 5 + .../pause-remove-from-document.html.ini | 5 + .../play-in-detached-document.html.ini | 5 + .../playbackRate.html.ini | 9 + .../preload_reflects_none_autoplay.html.ini | 8 + .../ready-states/autoplay.html.ini | 32 ++ .../seeking/seek-to-currentTime.html.ini | 6 + .../seeking/seek-to-max-value.htm.ini | 6 + .../seeking/seek-to-negative-time.htm.ini | 6 + .../media-controllers/task-source.html.ini | 5 + .../track/track-element/__dir__.ini | 1 + .../user-interface/muted.html.ini | 65 +++ .../media-elements/video_loop_base.html.ini | 6 + .../video_volume_check.html.ini | 8 + .../media-elements/volume_nonfinite.html.ini | 20 + 107 files changed, 1722 insertions(+), 9 deletions(-) delete mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/__dir__.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/audio_loop_base.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/audio_volume_check.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/error-codes/error.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadeddata.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_pause.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_pause_noautoplay.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_play.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_play_noautoplay.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_playing_noautoplay.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_timeupdate.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_volumechange.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/historical.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLMediaElement/addTextTrack.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLMediaElement/textTracks.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/default.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/kind.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/label.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/readyState.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/src.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/srclang.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/track.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/activeCues.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/addCue.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/constants.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/cues.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/kind.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/label.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/language.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/mode.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/oncuechange.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/removeCue.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/endTime.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/id.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/onenter.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/onexit.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/pauseOnExit.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/startTime.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/track.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCueList/getCueById.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCueList/getter.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCueList/length.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/getTrackById.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/getter.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/length.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/onaddtrack.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/onremovetrack.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TrackEvent/constructor.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TrackEvent/createEvent.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/autoplay-overrides-preload.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-events-networkState.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-removes-queued-error-event.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-insert-before.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-moved.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-remove-addEventListener.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-remove-onerror.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-audio-constructor-no-src.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-audio-constructor.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-in-sync-event.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-into-iframe.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-networkState.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-not-in-document.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-load.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-pause-networkState.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-pause.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-play.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-from-document-networkState.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-networkState.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-not-in-document.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-control.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-insert-br.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-insert-source.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-insert-text.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-remove-source-after.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-remove-source.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-remove-text.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-remove-source.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-remove-src.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-source-media.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/location-of-the-media-resource/currentSrc.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/mime-types/canPlayType.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/offsets-into-the-media-resource/currentTime.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/paused_false_during_play.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/paused_true_during_pause.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-to-other-document.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-within-document.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document-networkState.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/play-in-detached-document.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/playbackRate.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/preload_reflects_none_autoplay.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/ready-states/autoplay.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/seeking/seek-to-currentTime.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/seeking/seek-to-max-value.htm.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/seeking/seek-to-negative-time.htm.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/synchronising-multiple-media-elements/media-controllers/task-source.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/track/track-element/__dir__.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/user-interface/muted.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/video_loop_base.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/video_volume_check.html.ini create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/volume_nonfinite.html.ini diff --git a/components/script/document_loader.rs b/components/script/document_loader.rs index 5c835226a22..9b9075b2fe0 100644 --- a/components/script/document_loader.rs +++ b/components/script/document_loader.rs @@ -21,6 +21,7 @@ pub enum LoadType { Subframe(Url), Stylesheet(Url), PageSource(Url), + Media(Url), } impl LoadType { @@ -30,6 +31,7 @@ impl LoadType { LoadType::Script(ref url) | LoadType::Subframe(ref url) | LoadType::Stylesheet(ref url) | + LoadType::Media(ref url) | LoadType::PageSource(ref url) => url, } } @@ -39,7 +41,8 @@ impl LoadType { LoadType::Image(_) => LoadContext::Image, LoadType::Script(_) => LoadContext::Script, LoadType::Subframe(_) | LoadType::PageSource(_) => LoadContext::Browsing, - LoadType::Stylesheet(_) => LoadContext::Style + LoadType::Stylesheet(_) => LoadContext::Style, + LoadType::Media(_) => LoadContext::AudioVideo, } } } diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index 4e86aad0af3..d84e5be13cf 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -2,25 +2,153 @@ * 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 document_loader::LoadType; use dom::attr::Attr; use dom::bindings::cell::DOMRefCell; +use dom::bindings::codegen::Bindings::AttrBinding::AttrMethods; use dom::bindings::codegen::Bindings::HTMLMediaElementBinding::HTMLMediaElementMethods; -use dom::bindings::codegen::Bindings::HTMLMediaElementBinding::HTMLMediaElementConstants; +use dom::bindings::codegen::Bindings::HTMLMediaElementBinding::HTMLMediaElementConstants::*; +use dom::bindings::global::GlobalRef; use dom::bindings::inheritance::Castable; +use dom::bindings::js::Root; +use dom::bindings::refcounted::Trusted; use dom::document::Document; -use dom::element::AttributeMutation; +use dom::element::{Element, AttributeMutation}; +use dom::event::{Event, EventBubbles, EventCancelable}; use dom::htmlelement::HTMLElement; +use dom::htmlsourceelement::HTMLSourceElement; +use dom::node::{window_from_node, document_from_node}; use dom::virtualmethods::VirtualMethods; +use ipc_channel::ipc; +use ipc_channel::router::ROUTER; +use net_traits::{AsyncResponseListener, AsyncResponseTarget, Metadata, NetworkError}; +use network_listener::{NetworkListener, PreInvoke}; +use script_runtime::ScriptChan; +use script_thread::{Runnable, ScriptThread}; use std::cell::Cell; +use std::sync::{Arc, Mutex}; use string_cache::Atom; +use task_source::dom_manipulation::DOMManipulationTask; +use task_source::TaskSource; +use time::{self, Timespec, Duration}; +use url::Url; use util::str::DOMString; +struct HTMLMediaElementContext { + /// The element that initiated the request. + elem: Trusted, + /// The response body received to date. + data: Vec, + /// The response metadata received to date. + metadata: Option, + /// The generation of the media element when this fetch started. + generation_id: u32, + /// Time of last progress notification. + next_progress_event: Timespec, + /// Url of resource requested. + url: Url, + /// Whether the media metadata has been completely received. + have_metadata: bool, + /// True if this response is invalid and should be ignored. + ignore_response: bool, +} + +// https://html.spec.whatwg.org/multipage/#media-data-processing-steps-list +impl AsyncResponseListener for HTMLMediaElementContext { + // https://html.spec.whatwg.org/multipage/#media-data-processing-steps-list + fn headers_available(&mut self, metadata: Result) { + self.metadata = metadata.ok(); + + // => "If the media data cannot be fetched at all..." + let is_failure = self.metadata + .as_ref() + .and_then(|m| m.status + .as_ref() + .map(|s| s.0 < 200 || s.0 >= 300)) + .unwrap_or(false); + if is_failure { + // Ensure that the element doesn't receive any further notifications + // of the aborted fetch. The dedicated failure steps will be executed + // when response_complete runs. + self.ignore_response = true; + } + } + + fn data_available(&mut self, payload: Vec) { + if self.ignore_response { + return; + } + + let mut payload = payload; + self.data.append(&mut payload); + + let elem = self.elem.root(); + + if !self.have_metadata { + //TODO: actually check if the payload contains the full metadata + elem.change_ready_state(HAVE_METADATA); + self.have_metadata = true; + } else { + elem.change_ready_state(HAVE_CURRENT_DATA); + } + + if time::get_time() > self.next_progress_event { + elem.queue_fire_simple_event("progress"); + self.next_progress_event = time::get_time() + Duration::milliseconds(350); + } + } + + // https://html.spec.whatwg.org/multipage/#media-data-processing-steps-list + fn response_complete(&mut self, status: Result<(), NetworkError>) { + let elem = self.elem.root(); + + if status.is_ok() { + elem.change_ready_state(HAVE_ENOUGH_DATA); + + elem.fire_simple_event("progress"); + + elem.network_state.set(NETWORK_IDLE); + + elem.fire_simple_event("suspend"); + } else { + elem.queue_dedicated_media_source_failure_steps(); + } + + let document = document_from_node(&*elem); + document.finish_load(LoadType::Media(self.url.clone())); + } +} + +impl PreInvoke for HTMLMediaElementContext { + fn should_invoke(&self) -> bool { + //TODO: finish_load needs to run at some point if the generation changes. + self.elem.root().generation_id.get() == self.generation_id + } +} + +impl HTMLMediaElementContext { + fn new(elem: &HTMLMediaElement, url: Url) -> HTMLMediaElementContext { + HTMLMediaElementContext { + elem: Trusted::new(elem), + data: vec![], + metadata: None, + generation_id: elem.generation_id.get(), + next_progress_event: time::get_time() + Duration::milliseconds(350), + url: url, + have_metadata: false, + ignore_response: false, + } + } +} + #[dom_struct] pub struct HTMLMediaElement { htmlelement: HTMLElement, network_state: Cell, ready_state: Cell, current_src: DOMRefCell, + generation_id: Cell, + first_data_load: Cell, } impl HTMLMediaElement { @@ -30,9 +158,11 @@ impl HTMLMediaElement { HTMLMediaElement { htmlelement: HTMLElement::new_inherited(tag_name, prefix, document), - network_state: Cell::new(HTMLMediaElementConstants::NETWORK_EMPTY), - ready_state: Cell::new(HTMLMediaElementConstants::HAVE_NOTHING), + network_state: Cell::new(NETWORK_EMPTY), + ready_state: Cell::new(HAVE_NOTHING), current_src: DOMRefCell::new("".to_owned()), + generation_id: Cell::new(0), + first_data_load: Cell::new(true), } } @@ -41,7 +171,268 @@ impl HTMLMediaElement { &self.htmlelement } - fn media_element_load_algorithm(&self, _src: &str) { + fn queue_fire_simple_event(&self, type_: &'static str) { + let win = window_from_node(self); + let task = FireSimpleEventTask::new(self, type_); + let _ = win.dom_manipulation_task_source().queue(DOMManipulationTask::MediaTask(box task)); + } + + fn fire_simple_event(&self, type_: &str) { + let window = window_from_node(self); + let event = Event::new(GlobalRef::Window(&*window), + Atom::from(type_), + EventBubbles::DoesNotBubble, + EventCancelable::NotCancelable); + event.fire(self.upcast()); + } + + // https://html.spec.whatwg.org/multipage/#ready-states + fn change_ready_state(&self, ready_state: u16) { + let old_ready_state = self.ready_state.get(); + self.ready_state.set(ready_state); + + if self.network_state.get() == NETWORK_EMPTY { + return; + } + + match (old_ready_state, ready_state) { + // previous ready state was HAVE_NOTHING, and the new ready state is + // HAVE_METADATA + (HAVE_NOTHING, HAVE_METADATA) => { + self.queue_fire_simple_event("loadedmetadata"); + } + + // previous ready state was HAVE_METADATA and the new ready state is + // HAVE_CURRENT_DATA or greater + (HAVE_METADATA, HAVE_CURRENT_DATA) | + (HAVE_METADATA, HAVE_FUTURE_DATA) | + (HAVE_METADATA, HAVE_ENOUGH_DATA) => { + if self.first_data_load.get() { + self.first_data_load.set(false); + self.queue_fire_simple_event("loadeddata"); + } + } + + // previous ready state was HAVE_FUTURE_DATA or more, and the new ready + // state is HAVE_CURRENT_DATA or less + (HAVE_FUTURE_DATA, HAVE_CURRENT_DATA) | + (HAVE_ENOUGH_DATA, HAVE_CURRENT_DATA) | + (HAVE_FUTURE_DATA, HAVE_METADATA) | + (HAVE_ENOUGH_DATA, HAVE_METADATA) | + (HAVE_FUTURE_DATA, HAVE_NOTHING) | + (HAVE_ENOUGH_DATA, HAVE_NOTHING) => { + // TODO: timeupdate event logic + waiting + } + + _ => (), + } + + // If the new ready state is HAVE_FUTURE_DATA or HAVE_ENOUGH_DATA, + // then the relevant steps below must then be run also. + match (old_ready_state, ready_state) { + // previous ready state was HAVE_CURRENT_DATA or less, and the new ready + // state is HAVE_FUTURE_DATA + (HAVE_CURRENT_DATA, HAVE_FUTURE_DATA) | + (HAVE_METADATA, HAVE_FUTURE_DATA) | + (HAVE_NOTHING, HAVE_FUTURE_DATA) => { + self.queue_fire_simple_event("canplay"); + + // TODO: check paused state + self.queue_fire_simple_event("playing"); + } + + // new ready state is HAVE_ENOUGH_DATA + (_, HAVE_ENOUGH_DATA) => { + if old_ready_state <= HAVE_CURRENT_DATA { + self.queue_fire_simple_event("canplay"); + + //TODO: check paused state + self.queue_fire_simple_event("playing"); + } + + // TODO: autoplay-related logic + + self.queue_fire_simple_event("canplaythrough"); + } + + _ => (), + } + } + + // https://html.spec.whatwg.org/multipage/#concept-media-load-algorithm + fn invoke_resource_selection_algorithm(&self, base_url: Url) { + // Step 1 + self.network_state.set(NETWORK_NO_SOURCE); + + // TODO step 2 (show poster) + // TODO step 3 (delay load event) + + // Step 4 + ScriptThread::await_stable_state(ResourceSelectionTask::new(self, base_url)); + } + + // https://html.spec.whatwg.org/multipage/#concept-media-load-algorithm + fn resource_selection_algorithm_sync(&self, base_url: Url) { + // TODO step 5 (populate pending text tracks) + + // Step 6 + let mode = if false { + // TODO media provider object + ResourceSelectionMode::Object + } else if let Some(attr) = self.upcast::().get_attribute(&ns!(), &atom!("src")) { + ResourceSelectionMode::Attribute(attr.Value().to_string()) + } else if false { + // TODO child + ResourceSelectionMode::Children(panic!()) + } else { + self.network_state.set(NETWORK_EMPTY); + return; + }; + + // Step 7 + self.network_state.set(NETWORK_LOADING); + + // Step 8 + self.queue_fire_simple_event("loadstart"); + + // Step 9 + match mode { + ResourceSelectionMode::Object => { + // Step 1 + *self.current_src.borrow_mut() = "".to_owned(); + + // Step 4 + self.resource_fetch_algorithm(Resource::Object); + } + + ResourceSelectionMode::Attribute(src) => { + // Step 1 + if src.is_empty() { + // TODO failed with attribute + return; + } + + // Step 2 + let absolute_url = base_url.join(&src).map_err(|_| ()); + + // Step 3 + if let Ok(url) = absolute_url { + *self.current_src.borrow_mut() = url.as_str().into(); + // Step 4 + self.resource_fetch_algorithm(Resource::Url(url)); + } else { + self.queue_dedicated_media_source_failure_steps(); + } + } + + ResourceSelectionMode::Children(_child) => { + // TODO + self.queue_dedicated_media_source_failure_steps() + } + } + } + + // https://html.spec.whatwg.org/multipage/#concept-media-load-resource + fn resource_fetch_algorithm(&self, resource: Resource) { + // TODO step 3 (remove text tracks) + + // Step 4 + if let Resource::Url(url) = resource { + // TODO 4.1 (preload=none) + + // 4.2 + let context = Arc::new(Mutex::new(HTMLMediaElementContext::new(self, url.clone()))); + let (action_sender, action_receiver) = ipc::channel().unwrap(); + let script_chan = window_from_node(self).networking_task_source(); + let listener = box NetworkListener { + context: context, + script_chan: script_chan, + }; + + let response_target = AsyncResponseTarget { + sender: action_sender, + }; + ROUTER.add_route(action_receiver.to_opaque(), box move |message| { + listener.notify(message.to().unwrap()); + }); + + // FIXME: we're supposed to block the load event much earlier than now + let doc = document_from_node(self); + doc.load_async(LoadType::Media(url), response_target); + } else { + // TODO local resource fetch + self.queue_dedicated_media_source_failure_steps(); + } + } + + fn queue_dedicated_media_source_failure_steps(&self) { + let _ = window_from_node(self).dom_manipulation_task_source().queue( + DOMManipulationTask::MediaTask(box DedicatedMediaSourceFailureTask::new(self))); + } + + // https://html.spec.whatwg.org/multipage/#dedicated-media-source-failure-steps + fn dedicated_media_source_failure(&self) { + // TODO step 1 (error attribute) + + // TODO step 2 (forget resource tracks) + + // Step 3 + self.network_state.set(NETWORK_NO_SOURCE); + + // TODO step 4 (show poster) + + // Step 5 + self.fire_simple_event("error"); + + // TODO step 6 (delay load event) + } + + // https://html.spec.whatwg.org/multipage/#media-element-load-algorithm + fn media_element_load_algorithm(&self) { + self.first_data_load.set(true); + + // TODO Step 1 (abort resource selection algorithm instances) + + // Step 2 + self.generation_id.set(self.generation_id.get() + 1); + + // Step 3 + let network_state = self.NetworkState(); + match network_state { + NETWORK_LOADING | + NETWORK_IDLE => { + self.queue_fire_simple_event("abort"); + } + _ => (), + } + + // Step 4 + if network_state != NETWORK_EMPTY { + // 4.1 + self.queue_fire_simple_event("emptied"); + + // TODO 4.2 (abort in-progress fetch) + + // TODO 4.3 (forget resource tracks) + + // 4.4 + self.change_ready_state(HAVE_NOTHING); + + // TODO 4.5 (paused) + // TODO 4.6 (seeking) + // TODO 4.7 (playback position) + // TODO 4.8 (timeline offset) + // TODO 4.9 (duration) + } + + // TODO step 5 (playback rate) + // TODO step 6 (error/autoplaying) + + // Step 7 + let doc = document_from_node(self); + self.invoke_resource_selection_algorithm(doc.base_url()); + + // TODO step 8 (stop previously playing resource) } } @@ -75,11 +466,81 @@ impl VirtualMethods for HTMLMediaElement { match attr.local_name() { &atom!("src") => { - if let Some(value) = mutation.new_value(attr) { - self.media_element_load_algorithm(&value); + if mutation.new_value(attr).is_some() { + self.media_element_load_algorithm(); } } _ => (), }; } } + +struct FireSimpleEventTask { + elem: Trusted, + type_: &'static str, +} + +impl FireSimpleEventTask { + fn new(target: &HTMLMediaElement, type_: &'static str) -> FireSimpleEventTask { + FireSimpleEventTask { + elem: Trusted::new(target), + type_: type_, + } + } +} + +impl Runnable for FireSimpleEventTask { + fn handler(self: Box) { + let elem = self.elem.root(); + elem.fire_simple_event(self.type_); + } +} + +struct ResourceSelectionTask { + elem: Trusted, + base_url: Url, +} + +impl ResourceSelectionTask { + fn new(elem: &HTMLMediaElement, url: Url) -> ResourceSelectionTask { + ResourceSelectionTask { + elem: Trusted::new(elem), + base_url: url, + } + } +} + +impl Runnable for ResourceSelectionTask { + fn handler(self: Box) { + self.elem.root().resource_selection_algorithm_sync(self.base_url); + } +} + +struct DedicatedMediaSourceFailureTask { + elem: Trusted, +} + +impl DedicatedMediaSourceFailureTask { + fn new(elem: &HTMLMediaElement) -> DedicatedMediaSourceFailureTask { + DedicatedMediaSourceFailureTask { + elem: Trusted::new(elem), + } + } +} + +impl Runnable for DedicatedMediaSourceFailureTask { + fn handler(self: Box) { + self.elem.root().dedicated_media_source_failure(); + } +} + +enum ResourceSelectionMode { + Object, + Attribute(String), + Children(Root), +} + +enum Resource { + Object, + Url(Url), +} diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index c0753f897a7..32f595019aa 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -517,6 +517,19 @@ impl ScriptThread { }); } + // https://html.spec.whatwg.org/multipage/#await-a-stable-state + pub fn await_stable_state(task: T) { + //TODO use microtasks when they exist + SCRIPT_THREAD_ROOT.with(|root| { + if let Some(script_thread) = *root.borrow() { + let script_thread = unsafe { &*script_thread }; + let _ = script_thread.chan.send(CommonScriptMsg::RunnableMsg( + ScriptThreadEventCategory::DomEvent, + box task)); + } + }); + } + /// Creates a new script thread. pub fn new(state: InitialScriptState, port: Receiver, diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/__dir__.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/__dir__.ini deleted file mode 100644 index 163ca23a12f..00000000000 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/__dir__.ini +++ /dev/null @@ -1 +0,0 @@ -disabled: for now diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/audio_loop_base.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/audio_loop_base.html.ini new file mode 100644 index 00000000000..91202ffc556 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/audio_loop_base.html.ini @@ -0,0 +1,6 @@ +[audio_loop_base.html] + type: testharness + expected: TIMEOUT + [Check if audio.loop is set to true that expecting the seeking event is fired more than once] + expected: NOTRUN + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/audio_volume_check.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/audio_volume_check.html.ini new file mode 100644 index 00000000000..3ae02237dc7 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/audio_volume_check.html.ini @@ -0,0 +1,8 @@ +[audio_volume_check.html] + type: testharness + [Check if media.volume is set to new value less than 0.0 that expecting an IndexSizeError exception is to be thrown] + expected: FAIL + + [Check if audio.volume is set to new value greater than 1.0 that expecting an IndexSizeError exception is to be thrown] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/error-codes/error.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/error-codes/error.html.ini new file mode 100644 index 00000000000..087a6500f65 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/error-codes/error.html.ini @@ -0,0 +1,21 @@ +[error.html] + type: testharness + expected: TIMEOUT + [audio.error initial value] + expected: FAIL + + [audio.error after successful load] + expected: TIMEOUT + + [audio.error after setting src to the empty string] + expected: TIMEOUT + + [video.error initial value] + expected: FAIL + + [video.error after successful load] + expected: TIMEOUT + + [video.error after setting src to the empty string] + expected: TIMEOUT + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadeddata.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadeddata.html.ini new file mode 100644 index 00000000000..efd785bce04 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadeddata.html.ini @@ -0,0 +1,9 @@ +[event_loadeddata.html] + type: testharness + expected: TIMEOUT + [video events - loadeddata] + expected: FAIL + + [setting src attribute on autoplay video should trigger loadeddata event] + expected: NOTRUN + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_pause.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_pause.html.ini new file mode 100644 index 00000000000..ea9eaeadb65 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_pause.html.ini @@ -0,0 +1,9 @@ +[event_pause.html] + type: testharness + expected: TIMEOUT + [calling pause() on autoplay audio should trigger pause event] + expected: NOTRUN + + [calling pause() on autoplay video should trigger pause event] + expected: NOTRUN + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_pause_noautoplay.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_pause_noautoplay.html.ini new file mode 100644 index 00000000000..8301081a3f8 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_pause_noautoplay.html.ini @@ -0,0 +1,15 @@ +[event_pause_noautoplay.html] + type: testharness + expected: TIMEOUT + [audio events - pause] + expected: FAIL + + [calling play() then pause() on non-autoplay audio should trigger pause event] + expected: NOTRUN + + [video events - pause] + expected: FAIL + + [calling play() then pause() on non-autoplay video should trigger pause event] + expected: NOTRUN + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_play.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_play.html.ini new file mode 100644 index 00000000000..e692bd69d4c --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_play.html.ini @@ -0,0 +1,9 @@ +[event_play.html] + type: testharness + expected: TIMEOUT + [setting src attribute on autoplay audio should trigger play event] + expected: NOTRUN + + [setting src attribute on autoplay video should trigger play event] + expected: NOTRUN + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_play_noautoplay.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_play_noautoplay.html.ini new file mode 100644 index 00000000000..2b63fff4d80 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_play_noautoplay.html.ini @@ -0,0 +1,15 @@ +[event_play_noautoplay.html] + type: testharness + expected: TIMEOUT + [audio events - play] + expected: FAIL + + [calling play() on audio should trigger play event] + expected: NOTRUN + + [video events - play] + expected: FAIL + + [calling play() on video should trigger play event] + expected: NOTRUN + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_playing_noautoplay.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_playing_noautoplay.html.ini new file mode 100644 index 00000000000..d677d4fa136 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_playing_noautoplay.html.ini @@ -0,0 +1,8 @@ +[event_playing_noautoplay.html] + type: testharness + [audio events - playing] + expected: FAIL + + [video events - playing] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_timeupdate.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_timeupdate.html.ini new file mode 100644 index 00000000000..40e496b3860 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_timeupdate.html.ini @@ -0,0 +1,9 @@ +[event_timeupdate.html] + type: testharness + expected: TIMEOUT + [setting src attribute on a sufficiently long autoplay audio should trigger timeupdate event] + expected: NOTRUN + + [setting src attribute on a sufficiently long autoplay video should trigger timeupdate event] + expected: NOTRUN + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html.ini new file mode 100644 index 00000000000..53dce24c690 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html.ini @@ -0,0 +1,15 @@ +[event_timeupdate_noautoplay.html] + type: testharness + expected: TIMEOUT + [audio events - timeupdate] + expected: FAIL + + [calling play() on a sufficiently long audio should trigger timeupdate event] + expected: NOTRUN + + [video events - timeupdate] + expected: FAIL + + [calling play() on a sufficiently long video should trigger timeupdate event] + expected: NOTRUN + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_volumechange.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_volumechange.html.ini new file mode 100644 index 00000000000..b10b96a7d6a --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_volumechange.html.ini @@ -0,0 +1,27 @@ +[event_volumechange.html] + type: testharness + expected: TIMEOUT + [setting audio.volume fires volumechange] + expected: FAIL + + [setting audio.muted fires volumechange] + expected: FAIL + + [setting audio.volume/muted to the same value does not fire volumechange] + expected: TIMEOUT + + [setting audio.volume/muted repeatedly fires volumechange repeatedly] + expected: TIMEOUT + + [setting video.volume fires volumechange] + expected: FAIL + + [setting video.muted fires volumechange] + expected: FAIL + + [setting video.volume/muted to the same value does not fire volumechange] + expected: TIMEOUT + + [setting video.volume/muted repeatedly fires volumechange repeatedly] + expected: TIMEOUT + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/historical.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/historical.html.ini new file mode 100644 index 00000000000..f42f4aa9674 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/historical.html.ini @@ -0,0 +1,5 @@ +[historical.html] + type: testharness + [TextTrackCue constructor should not be supported] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLMediaElement/addTextTrack.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLMediaElement/addTextTrack.html.ini new file mode 100644 index 00000000000..d15eefdb656 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLMediaElement/addTextTrack.html.ini @@ -0,0 +1,29 @@ +[addTextTrack.html] + type: testharness + [HTMLMediaElement.addTextTrack subtitles first arg] + expected: FAIL + + [HTMLMediaElement.addTextTrack captions first arg] + expected: FAIL + + [HTMLMediaElement.addTextTrack descriptions first arg] + expected: FAIL + + [HTMLMediaElement.addTextTrack chapters first arg] + expected: FAIL + + [HTMLMediaElement.addTextTrack metadata first arg] + expected: FAIL + + [HTMLMediaElement.addTextTrack undefined second and third arg] + expected: FAIL + + [HTMLMediaElement.addTextTrack null second and third arg] + expected: FAIL + + [HTMLMediaElement.addTextTrack foo and bar second and third arg] + expected: FAIL + + [HTMLMediaElement.addTextTrack foo second arg, third arg omitted] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLMediaElement/textTracks.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLMediaElement/textTracks.html.ini new file mode 100644 index 00000000000..40173fa405d --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLMediaElement/textTracks.html.ini @@ -0,0 +1,5 @@ +[textTracks.html] + type: testharness + [HTMLMediaElement.textTracks] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/default.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/default.html.ini new file mode 100644 index 00000000000..a382ffa40a6 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/default.html.ini @@ -0,0 +1,23 @@ +[default.html] + type: testharness + [HTMLTrackElement.default missing value] + expected: FAIL + + [HTMLTrackElement.default empty string content attribute] + expected: FAIL + + [HTMLTrackElement.default empty string IDL attribute] + expected: FAIL + + [HTMLTrackElement.default foo in content attribute] + expected: FAIL + + [HTMLTrackElement.default foo in IDL attribute] + expected: FAIL + + [HTMLTrackElement.default true in IDL attribute] + expected: FAIL + + [HTMLTrackElement.default false in IDL attribute] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/kind.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/kind.html.ini new file mode 100644 index 00000000000..37d4519dae3 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/kind.html.ini @@ -0,0 +1,62 @@ +[kind.html] + type: testharness + [HTMLTrackElement.kind missing value] + expected: FAIL + + [HTMLTrackElement.kind invalid value in content attribute] + expected: FAIL + + [HTMLTrackElement.kind content attribute uppercase] + expected: FAIL + + [HTMLTrackElement.kind content attribute with uppercase turkish I (with dot)] + expected: FAIL + + [HTMLTrackElement.kind content attribute with lowercase turkish i (dotless)] + expected: FAIL + + [HTMLTrackElement.kind content attribute "subtitles"] + expected: FAIL + + [HTMLTrackElement.kind content attribute "captions"] + expected: FAIL + + [HTMLTrackElement.kind content attribute "descriptions"] + expected: FAIL + + [HTMLTrackElement.kind content attribute "chapters"] + expected: FAIL + + [HTMLTrackElement.kind content attribute "metadata"] + expected: FAIL + + [HTMLTrackElement.kind content attribute "captions\\u0000"] + expected: FAIL + + [HTMLTrackElement.kind setting IDL attribute to "subtitles"] + expected: FAIL + + [HTMLTrackElement.kind setting IDL attribute to "captions"] + expected: FAIL + + [HTMLTrackElement.kind setting IDL attribute to "descriptions"] + expected: FAIL + + [HTMLTrackElement.kind setting IDL attribute to "chapters"] + expected: FAIL + + [HTMLTrackElement.kind setting IDL attribute to "metadata"] + expected: FAIL + + [HTMLTrackElement.kind setting IDL attribute to "CAPTIONS"] + expected: FAIL + + [HTMLTrackElement.kind setting IDL attribute with uppercase turkish I (with dot)] + expected: FAIL + + [HTMLTrackElement.kind setting IDL attribute with lowercase turkish I (dotless)] + expected: FAIL + + [HTMLTrackElement.kind setting IDL attribute with \\u0000] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/label.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/label.html.ini new file mode 100644 index 00000000000..01f79886378 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/label.html.ini @@ -0,0 +1,35 @@ +[label.html] + type: testharness + [HTMLTrackElement.label missing value] + expected: FAIL + + [HTMLTrackElement.label empty string content attribute] + expected: FAIL + + [HTMLTrackElement.label empty string IDL attribute] + expected: FAIL + + [HTMLTrackElement.label lowercase content attribute] + expected: FAIL + + [HTMLTrackElement.label uppercase content attribute] + expected: FAIL + + [HTMLTrackElement.label\\u0000 in content attribute] + expected: FAIL + + [HTMLTrackElement.label lowercase IDL attribute] + expected: FAIL + + [HTMLTrackElement.label uppercase IDL attribute] + expected: FAIL + + [HTMLTrackElement.label whitespace in content attribute] + expected: FAIL + + [HTMLTrackElement.label whitespace in IDL attribute] + expected: FAIL + + [HTMLTrackElement.label \\u0000 in IDL attribute] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/readyState.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/readyState.html.ini new file mode 100644 index 00000000000..27cb06d6489 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/readyState.html.ini @@ -0,0 +1,5 @@ +[readyState.html] + type: testharness + [HTMLTrackElement.readyState default value] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/src.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/src.html.ini new file mode 100644 index 00000000000..74842c215ac --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/src.html.ini @@ -0,0 +1,28 @@ +[src.html] + type: testharness + [HTMLTrackElement.src missing value] + expected: FAIL + + [HTMLTrackElement.src empty string in content attribute] + expected: FAIL + + [HTMLTrackElement.src empty string in IDL attribute] + expected: FAIL + + [HTMLTrackElement.src unresolvable value in content attribute] + expected: FAIL + + [HTMLTrackElement.src assigning unresolvable value to IDL attribute] + expected: FAIL + + [HTMLTrackElement.src assigning resolvable value to IDL attribute] + expected: FAIL + + [HTMLTrackElement.src assigning \\u0000 to IDL attribute] + expected: FAIL + + [HTMLTrackElement.src \\u0000 in content attribute] + expected: FAIL + + [HTMLTrackElement.src resolvable value in content attribute] + expected: FAIL diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/srclang.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/srclang.html.ini new file mode 100644 index 00000000000..0388e5cdeef --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/srclang.html.ini @@ -0,0 +1,35 @@ +[srclang.html] + type: testharness + [HTMLTrackElement.srclang missing value] + expected: FAIL + + [HTMLTrackElement.srclang empty string content attribute] + expected: FAIL + + [HTMLTrackElement.srclang empty string IDL attribute] + expected: FAIL + + [HTMLTrackElement.srclang lowercase content attribute] + expected: FAIL + + [HTMLTrackElement.srclang uppercase content attribute] + expected: FAIL + + [HTMLTrackElement.srclang \\u0000 content attribute] + expected: FAIL + + [HTMLTrackElement.srclang lowercase IDL attribute] + expected: FAIL + + [HTMLTrackElement.srclang uppercase IDL attribute] + expected: FAIL + + [HTMLTrackElement.srclang whitespace in content attribute] + expected: FAIL + + [HTMLTrackElement.srclang whitespace in IDL attribute] + expected: FAIL + + [HTMLTrackElement.srclang \\u0000 in IDL attribute] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/track.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/track.html.ini new file mode 100644 index 00000000000..0ef41193522 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/track.html.ini @@ -0,0 +1,5 @@ +[track.html] + type: testharness + [HTMLTrackElement.track] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/activeCues.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/activeCues.html.ini new file mode 100644 index 00000000000..1a756ae596b --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/activeCues.html.ini @@ -0,0 +1,21 @@ +[activeCues.html] + type: testharness + expected: ERROR + [TextTrack.activeCues, empty list] + expected: FAIL + + [TextTrack.activeCues, after addCue()] + expected: FAIL + + [TextTrack.activeCues, different modes] + expected: FAIL + + [TextTrack.activeCues, video loading] + expected: FAIL + + [TextTrack.activeCues, video playing] + expected: TIMEOUT + + [TextTrack.activeCues, adding cue during playback] + expected: TIMEOUT + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/addCue.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/addCue.html.ini new file mode 100644 index 00000000000..43344f07265 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/addCue.html.ini @@ -0,0 +1,17 @@ +[addCue.html] + type: testharness + [TextTrack.addCue(), adding a cue to two different tracks] + expected: FAIL + + [TextTrack.addCue(), adding a cue to a track twice] + expected: FAIL + + [TextTrack.addCue(), adding a removed cue to a different track] + expected: FAIL + + [TextTrack.addCue(), adding an associated but removed cue to the same track] + expected: FAIL + + [TextTrack.addCue(), adding a cue associated with a track element to other track] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/constants.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/constants.html.ini new file mode 100644 index 00000000000..2dd405860dd --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/constants.html.ini @@ -0,0 +1,6 @@ +[constants.html] + type: testharness + expected: ERROR + [TextTrack constants] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/cues.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/cues.html.ini new file mode 100644 index 00000000000..0fe949f114e --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/cues.html.ini @@ -0,0 +1,17 @@ +[cues.html] + type: testharness + [TextTrack.cues, empty list] + expected: FAIL + + [TextTrack.cues, after addCue()] + expected: FAIL + + [TextTrack.cues, different modes] + expected: FAIL + + [TextTrack.cues, changing order] + expected: FAIL + + [TextTrack.cues, default attribute] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/kind.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/kind.html.ini new file mode 100644 index 00000000000..970b33a0093 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/kind.html.ini @@ -0,0 +1,11 @@ +[kind.html] + type: testharness + [TextTrack.kind, addTextTrack] + expected: FAIL + + [TextTrack.kind, track element] + expected: FAIL + + [TextTrack.kind, \\u0000] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/label.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/label.html.ini new file mode 100644 index 00000000000..7c9ed164d7e --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/label.html.ini @@ -0,0 +1,9 @@ +[label.html] + type: testharness + expected: ERROR + [TextTrack.label] + expected: FAIL + + [TextTrack.label, \\u0000] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/language.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/language.html.ini new file mode 100644 index 00000000000..dd162835f97 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/language.html.ini @@ -0,0 +1,9 @@ +[language.html] + type: testharness + expected: ERROR + [TextTrack.language] + expected: FAIL + + [TextTrack.language, \\u0000] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/mode.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/mode.html.ini new file mode 100644 index 00000000000..6002b7b5a40 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/mode.html.ini @@ -0,0 +1,8 @@ +[mode.html] + type: testharness + [TextTrack.mode, wrong value] + expected: FAIL + + [TextTrack.mode, correct value] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/oncuechange.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/oncuechange.html.ini new file mode 100644 index 00000000000..64ddddc6ba9 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/oncuechange.html.ini @@ -0,0 +1,9 @@ +[oncuechange.html] + type: testharness + expected: ERROR + [TextTrack.oncuechange] + expected: FAIL + + [TextTrack.addEventListener/removeEventListener] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/removeCue.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/removeCue.html.ini new file mode 100644 index 00000000000..99cdc282fae --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrack/removeCue.html.ini @@ -0,0 +1,8 @@ +[removeCue.html] + type: testharness + [TextTrack.removeCue(), two elementless tracks] + expected: FAIL + + [TextTrack.removeCue(), cue from track element] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/endTime.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/endTime.html.ini new file mode 100644 index 00000000000..f4fb046a398 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/endTime.html.ini @@ -0,0 +1,9 @@ +[endTime.html] + type: testharness + expected: ERROR + [TextTrackCue.endTime, script-created cue] + expected: FAIL + + [TextTrackCue.endTime, parsed cue] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/id.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/id.html.ini new file mode 100644 index 00000000000..e6a27688379 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/id.html.ini @@ -0,0 +1,9 @@ +[id.html] + type: testharness + expected: ERROR + [TextTrackCue.id, script-created cue] + expected: FAIL + + [TextTrackCue.id, parsed cue] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/onenter.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/onenter.html.ini new file mode 100644 index 00000000000..5b2a043364a --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/onenter.html.ini @@ -0,0 +1,9 @@ +[onenter.html] + type: testharness + expected: ERROR + [TextTrackCue.onenter] + expected: FAIL + + [TextTrackCue.addEventListener/removeEventListener] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/onexit.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/onexit.html.ini new file mode 100644 index 00000000000..da08b3ed3de --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/onexit.html.ini @@ -0,0 +1,9 @@ +[onexit.html] + type: testharness + expected: ERROR + [TextTrackCue.onexit] + expected: FAIL + + [TextTrackCue.addEventListener/removeEventListener] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/pauseOnExit.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/pauseOnExit.html.ini new file mode 100644 index 00000000000..b349e7912ed --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/pauseOnExit.html.ini @@ -0,0 +1,9 @@ +[pauseOnExit.html] + type: testharness + expected: ERROR + [TextTrackCue.pauseOnExit, script-created cue] + expected: FAIL + + [TextTrackCue.pauseOnExit, parsed cue] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/startTime.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/startTime.html.ini new file mode 100644 index 00000000000..d0ee6f3033a --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/startTime.html.ini @@ -0,0 +1,9 @@ +[startTime.html] + type: testharness + expected: ERROR + [TextTrackCue.startTime, script-created cue] + expected: FAIL + + [TextTrackCue.startTime, parsed cue] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/track.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/track.html.ini new file mode 100644 index 00000000000..559ee4d0e40 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/track.html.ini @@ -0,0 +1,9 @@ +[track.html] + type: testharness + expected: ERROR + [TextTrackCue.track, script-created cue] + expected: FAIL + + [TextTrackCue.track, parsed cue] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCueList/getCueById.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCueList/getCueById.html.ini new file mode 100644 index 00000000000..8eabcce6a63 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCueList/getCueById.html.ini @@ -0,0 +1,14 @@ +[getCueById.html] + type: testharness + [TextTrackCueList.getCueById, no id] + expected: FAIL + + [TextTrackCueList.getCueById, id foo] + expected: FAIL + + [TextTrackCueList.getCueById, no 1] + expected: FAIL + + [TextTrackCueList.getCueById, id a\\u0000b] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCueList/getter.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCueList/getter.html.ini new file mode 100644 index 00000000000..1e9b25fa0e9 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCueList/getter.html.ini @@ -0,0 +1,12 @@ +[getter.html] + type: testharness + expected: ERROR + [TextTrackCueList getter] + expected: FAIL + + [TextTrackCueList getter, no indexed set/create] + expected: FAIL + + [TextTrackCueList getter, no indexed set/create (strict)] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCueList/length.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCueList/length.html.ini new file mode 100644 index 00000000000..0400d492ae8 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackCueList/length.html.ini @@ -0,0 +1,6 @@ +[length.html] + type: testharness + expected: ERROR + [TextTrackCueList.length] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/getTrackById.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/getTrackById.html.ini new file mode 100644 index 00000000000..f8bf007761b --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/getTrackById.html.ini @@ -0,0 +1,5 @@ +[getTrackById.html] + type: testharness + [TextTrackList.getTrackById] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/getter.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/getter.html.ini new file mode 100644 index 00000000000..cebc16828b6 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/getter.html.ini @@ -0,0 +1,12 @@ +[getter.html] + type: testharness + expected: ERROR + [TextTrackList getter] + expected: FAIL + + [TextTrackList getter, no indexed set/create] + expected: FAIL + + [TextTrackList getter, no indexed set/create (strict)] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/length.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/length.html.ini new file mode 100644 index 00000000000..fbbab9429bc --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/length.html.ini @@ -0,0 +1,6 @@ +[length.html] + type: testharness + expected: ERROR + [TextTrackList.length] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/onaddtrack.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/onaddtrack.html.ini new file mode 100644 index 00000000000..3be5a75b9fd --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/onaddtrack.html.ini @@ -0,0 +1,8 @@ +[onaddtrack.html] + type: testharness + [TextTrackList.onaddtrack] + expected: FAIL + + [TextTrackList.addEventListener/removeEventListener] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/onremovetrack.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/onremovetrack.html.ini new file mode 100644 index 00000000000..23de87032d6 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/onremovetrack.html.ini @@ -0,0 +1,8 @@ +[onremovetrack.html] + type: testharness + [TextTrackList.onremovetrack] + expected: FAIL + + [TextTrackList.addEventListener/removeEventListener] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TrackEvent/constructor.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TrackEvent/constructor.html.ini new file mode 100644 index 00000000000..568f521fe0a --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TrackEvent/constructor.html.ini @@ -0,0 +1,8 @@ +[constructor.html] + type: testharness + [TrackEvent constructor, one arg] + expected: FAIL + + [TrackEvent constructor, two args] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TrackEvent/createEvent.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TrackEvent/createEvent.html.ini new file mode 100644 index 00000000000..7a8c0c21f4b --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/interfaces/TrackEvent/createEvent.html.ini @@ -0,0 +1,5 @@ +[createEvent.html] + type: testharness + [TrackEvent created with createEvent] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/autoplay-overrides-preload.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/autoplay-overrides-preload.html.ini new file mode 100644 index 00000000000..566ab27894d --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/autoplay-overrides-preload.html.ini @@ -0,0 +1,14 @@ +[autoplay-overrides-preload.html] + type: testharness + [autoplay (set first) overrides preload "none"] + expected: FAIL + + [autoplay (set last) overrides preload "none"] + expected: FAIL + + [autoplay (set first) overrides preload "metadata"] + expected: FAIL + + [autoplay (set last) overrides preload "metadata"] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-events-networkState.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-events-networkState.html.ini new file mode 100644 index 00000000000..7ddea2d7d5c --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-events-networkState.html.ini @@ -0,0 +1,12 @@ +[load-events-networkState.html] + type: testharness + expected: TIMEOUT + [NETWORK_IDLE] + expected: TIMEOUT + + [NETWORK_LOADING] + expected: TIMEOUT + + [NETWORK_NO_SOURCE] + expected: TIMEOUT + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-removes-queued-error-event.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-removes-queued-error-event.html.ini new file mode 100644 index 00000000000..20cdf22dda3 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-removes-queued-error-event.html.ini @@ -0,0 +1,9 @@ +[load-removes-queued-error-event.html] + type: testharness + expected: TIMEOUT + [video error event] + expected: TIMEOUT + + [source error event] + expected: TIMEOUT + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-insert-before.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-insert-before.html.ini new file mode 100644 index 00000000000..4908ff33efe --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-insert-before.html.ini @@ -0,0 +1,6 @@ +[resource-selection-candidate-insert-before.html] + type: testharness + expected: TIMEOUT + [inserting another source before the candidate] + expected: TIMEOUT + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-moved.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-moved.html.ini new file mode 100644 index 00000000000..bde1b5e1ded --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-moved.html.ini @@ -0,0 +1,5 @@ +[resource-selection-candidate-moved.html] + type: testharness + [moving the candidate source] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-remove-addEventListener.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-remove-addEventListener.html.ini new file mode 100644 index 00000000000..48bc50031b3 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-remove-addEventListener.html.ini @@ -0,0 +1,6 @@ +[resource-selection-candidate-remove-addEventListener.html] + type: testharness + expected: TIMEOUT + [removing the candidate source, addEventListener] + expected: TIMEOUT + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-remove-onerror.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-remove-onerror.html.ini new file mode 100644 index 00000000000..b7ed7bf7e64 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-remove-onerror.html.ini @@ -0,0 +1,6 @@ +[resource-selection-candidate-remove-onerror.html] + type: testharness + expected: TIMEOUT + [removing the candidate source, onerror] + expected: TIMEOUT + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-audio-constructor-no-src.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-audio-constructor-no-src.html.ini new file mode 100644 index 00000000000..16df0a158c8 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-audio-constructor-no-src.html.ini @@ -0,0 +1,5 @@ +[resource-selection-invoke-audio-constructor-no-src.html] + type: testharness + [NOT invoking resource selection with new Audio() sans src] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-audio-constructor.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-audio-constructor.html.ini new file mode 100644 index 00000000000..59edc405c17 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-audio-constructor.html.ini @@ -0,0 +1,5 @@ +[resource-selection-invoke-audio-constructor.html] + type: testharness + [invoking resource selection with new Audio(src)] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-in-sync-event.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-in-sync-event.html.ini new file mode 100644 index 00000000000..e40c139642f --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-in-sync-event.html.ini @@ -0,0 +1,5 @@ +[resource-selection-invoke-in-sync-event.html] + type: testharness + [await a stable state and sync event handlers] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-into-iframe.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-into-iframe.html.ini new file mode 100644 index 00000000000..cab876905bf --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-into-iframe.html.ini @@ -0,0 +1,6 @@ +[resource-selection-invoke-insert-into-iframe.html] + type: testharness + expected: TIMEOUT + [NOT invoking resource selection by inserting into other document with src set] + expected: TIMEOUT + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-networkState.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-networkState.html.ini new file mode 100644 index 00000000000..2fb9a124833 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-networkState.html.ini @@ -0,0 +1,5 @@ +[resource-selection-invoke-insert-source-networkState.html] + type: testharness + [NOT invoking resource selection by inserting ] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-not-in-document.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-not-in-document.html.ini new file mode 100644 index 00000000000..57f6b477551 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-not-in-document.html.ini @@ -0,0 +1,5 @@ +[resource-selection-invoke-insert-source-not-in-document.html] + type: testharness + [invoking resource selection by inserting ] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source.html.ini new file mode 100644 index 00000000000..e91e60c37d0 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source.html.ini @@ -0,0 +1,5 @@ +[resource-selection-invoke-insert-source.html] + type: testharness + [invoking resource selection by inserting ] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-load.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-load.html.ini new file mode 100644 index 00000000000..f27a8b88e16 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-load.html.ini @@ -0,0 +1,5 @@ +[resource-selection-invoke-load.html] + type: testharness + [invoking resource selection with load()] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-pause-networkState.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-pause-networkState.html.ini new file mode 100644 index 00000000000..3ca07b5635e --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-pause-networkState.html.ini @@ -0,0 +1,5 @@ +[resource-selection-invoke-pause-networkState.html] + type: testharness + [NOT invoking resource selection with pause() when networkState is not NETWORK_EMPTY] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-pause.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-pause.html.ini new file mode 100644 index 00000000000..778a31e4fc0 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-pause.html.ini @@ -0,0 +1,5 @@ +[resource-selection-invoke-pause.html] + type: testharness + [invoking resource selection with pause()] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-play.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-play.html.ini new file mode 100644 index 00000000000..e0181017194 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-play.html.ini @@ -0,0 +1,5 @@ +[resource-selection-invoke-play.html] + type: testharness + [invoking resource selection with play()] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-from-document-networkState.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-from-document-networkState.html.ini new file mode 100644 index 00000000000..0104538e3a5 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-from-document-networkState.html.ini @@ -0,0 +1,5 @@ +[resource-selection-invoke-remove-from-document-networkState.html] + type: testharness + [NOT invoking resource selection with implicit pause() when networkState is not NETWORK_EMPTY] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-networkState.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-networkState.html.ini new file mode 100644 index 00000000000..2d8258abf78 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-networkState.html.ini @@ -0,0 +1,5 @@ +[resource-selection-invoke-set-src-networkState.html] + type: testharness + [invoking load by setting src when networkState is not NETWORK_EMPTY] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-not-in-document.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-not-in-document.html.ini new file mode 100644 index 00000000000..b4b13f4b436 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-not-in-document.html.ini @@ -0,0 +1,5 @@ +[resource-selection-invoke-set-src-not-in-document.html] + type: testharness + [invoking load by setting src on video not in a document] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src.html.ini new file mode 100644 index 00000000000..7ee9523c423 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src.html.ini @@ -0,0 +1,5 @@ +[resource-selection-invoke-set-src.html] + type: testharness + [invoking load by setting src] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-control.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-control.html.ini new file mode 100644 index 00000000000..fe2016c9d42 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-control.html.ini @@ -0,0 +1,5 @@ +[resource-selection-pointer-control.html] + type: testharness + [pointer updates (control test)] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-insert-br.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-insert-br.html.ini new file mode 100644 index 00000000000..14255883ba5 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-insert-br.html.ini @@ -0,0 +1,5 @@ +[resource-selection-pointer-insert-br.html] + type: testharness + [pointer updates (adding br elements)] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-insert-source.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-insert-source.html.ini new file mode 100644 index 00000000000..667ad9b11f8 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-insert-source.html.ini @@ -0,0 +1,5 @@ +[resource-selection-pointer-insert-source.html] + type: testharness + [pointer updates (adding source elements)] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-insert-text.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-insert-text.html.ini new file mode 100644 index 00000000000..c173934c343 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-insert-text.html.ini @@ -0,0 +1,5 @@ +[resource-selection-pointer-insert-text.html] + type: testharness + [pointer updates (adding text nodes)] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-remove-source-after.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-remove-source-after.html.ini new file mode 100644 index 00000000000..830de170a02 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-remove-source-after.html.ini @@ -0,0 +1,5 @@ +[resource-selection-pointer-remove-source-after.html] + type: testharness + [pointer updates (removing source element after pointer)] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-remove-source.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-remove-source.html.ini new file mode 100644 index 00000000000..c10e6d7d09a --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-remove-source.html.ini @@ -0,0 +1,5 @@ +[resource-selection-pointer-remove-source.html] + type: testharness + [pointer updates (removing source elements)] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-remove-text.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-remove-text.html.ini new file mode 100644 index 00000000000..ed914503e36 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-remove-text.html.ini @@ -0,0 +1,5 @@ +[resource-selection-pointer-remove-text.html] + type: testharness + [pointer updates (removing text nodes)] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-remove-source.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-remove-source.html.ini new file mode 100644 index 00000000000..937b76aebca --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-remove-source.html.ini @@ -0,0 +1,5 @@ +[resource-selection-remove-source.html] + type: testharness + [Changes to networkState when inserting and removing a ] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-remove-src.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-remove-src.html.ini new file mode 100644 index 00000000000..1e560e440e6 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-remove-src.html.ini @@ -0,0 +1,5 @@ +[resource-selection-remove-src.html] + type: testharness + [invoking resource selection by setting src; await stable state] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-source-media.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-source-media.html.ini new file mode 100644 index 00000000000..c8afa274d8f --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-source-media.html.ini @@ -0,0 +1,5 @@ +[resource-selection-source-media.html] + type: testharness + [the ] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/location-of-the-media-resource/currentSrc.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/location-of-the-media-resource/currentSrc.html.ini new file mode 100644 index 00000000000..306e4785db3 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/location-of-the-media-resource/currentSrc.html.ini @@ -0,0 +1,20 @@ +[currentSrc.html] + type: testharness + [audio.currentSrc after adding source element with src attribute "."] + expected: FAIL + + [audio.currentSrc after adding source element with src attribute " "] + expected: FAIL + + [audio.currentSrc after adding source element with src attribute "data:,"] + expected: FAIL + + [video.currentSrc after adding source element with src attribute "."] + expected: FAIL + + [video.currentSrc after adding source element with src attribute " "] + expected: FAIL + + [video.currentSrc after adding source element with src attribute "data:,"] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/mime-types/canPlayType.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/mime-types/canPlayType.html.ini new file mode 100644 index 00000000000..76521be77f4 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/mime-types/canPlayType.html.ini @@ -0,0 +1,152 @@ +[canPlayType.html] + type: testharness + [application/octet-stream] + expected: FAIL + + [video/x-new-fictional-format] + expected: FAIL + + [audio/mp4 (optional)] + expected: FAIL + + [audio/mp4; codecs="mp4a.40.2" (optional)] + expected: FAIL + + [audio/mp4 with bogus codec] + expected: FAIL + + [audio/ogg (optional)] + expected: FAIL + + [audio/ogg; codecs="opus" (optional)] + expected: FAIL + + [audio/ogg; codecs="vorbis" (optional)] + expected: FAIL + + [audio/ogg with bogus codec] + expected: FAIL + + [audio/wav (optional)] + expected: FAIL + + [audio/wav; codecs="1" (optional)] + expected: FAIL + + [audio/wav with bogus codec] + expected: FAIL + + [audio/webm (optional)] + expected: FAIL + + [audio/webm; codecs="opus" (optional)] + expected: FAIL + + [audio/webm; codecs="vorbis" (optional)] + expected: FAIL + + [audio/webm with bogus codec] + expected: FAIL + + [video/3gpp (optional)] + expected: FAIL + + [video/3gpp; codecs="samr" (optional)] + expected: FAIL + + [video/3gpp; codecs="mp4v.20.8" (optional)] + expected: FAIL + + [video/3gpp codecs subset] + expected: FAIL + + [video/3gpp codecs order] + expected: FAIL + + [video/3gpp with bogus codec] + expected: FAIL + + [video/mp4 (optional)] + expected: FAIL + + [video/mp4; codecs="mp4a.40.2" (optional)] + expected: FAIL + + [video/mp4; codecs="avc1.42E01E" (optional)] + expected: FAIL + + [video/mp4; codecs="avc1.4D401E" (optional)] + expected: FAIL + + [video/mp4; codecs="avc1.58A01E" (optional)] + expected: FAIL + + [video/mp4; codecs="avc1.64001E" (optional)] + expected: FAIL + + [video/mp4; codecs="mp4v.20.8" (optional)] + expected: FAIL + + [video/mp4; codecs="mp4v.20.240" (optional)] + expected: FAIL + + [video/mp4 codecs subset] + expected: FAIL + + [video/mp4 codecs order] + expected: FAIL + + [video/mp4 with bogus codec] + expected: FAIL + + [video/ogg (optional)] + expected: FAIL + + [video/ogg; codecs="opus" (optional)] + expected: FAIL + + [video/ogg; codecs="vorbis" (optional)] + expected: FAIL + + [video/ogg; codecs="theora" (optional)] + expected: FAIL + + [video/ogg codecs subset] + expected: FAIL + + [video/ogg codecs order] + expected: FAIL + + [video/ogg with bogus codec] + expected: FAIL + + [video/webm (optional)] + expected: FAIL + + [video/webm; codecs="opus" (optional)] + expected: FAIL + + [video/webm; codecs="vorbis" (optional)] + expected: FAIL + + [video/webm; codecs="vp8" (optional)] + expected: FAIL + + [video/webm; codecs="vp8.0" (optional)] + expected: FAIL + + [video/webm; codecs="vp9" (optional)] + expected: FAIL + + [video/webm; codecs="vp9.0" (optional)] + expected: FAIL + + [video/webm codecs subset] + expected: FAIL + + [video/webm codecs order] + expected: FAIL + + [video/webm with bogus codec] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/offsets-into-the-media-resource/currentTime.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/offsets-into-the-media-resource/currentTime.html.ini new file mode 100644 index 00000000000..39211dc575d --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/offsets-into-the-media-resource/currentTime.html.ini @@ -0,0 +1,15 @@ +[currentTime.html] + type: testharness + expected: TIMEOUT + [currentTime initial value] + expected: FAIL + + [setting currentTime with a media controller present] + expected: FAIL + + [setting currentTime when readyState is HAVE_NOTHING] + expected: FAIL + + [setting currentTime when readyState is greater than HAVE_NOTHING] + expected: TIMEOUT + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/paused_false_during_play.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/paused_false_during_play.html.ini new file mode 100644 index 00000000000..d73cb8ba85a --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/paused_false_during_play.html.ini @@ -0,0 +1,9 @@ +[paused_false_during_play.html] + type: testharness + expected: TIMEOUT + [audio.paused should be false during play event] + expected: NOTRUN + + [video.paused should be false during play event] + expected: NOTRUN + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/paused_true_during_pause.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/paused_true_during_pause.html.ini new file mode 100644 index 00000000000..ae591b69432 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/paused_true_during_pause.html.ini @@ -0,0 +1,15 @@ +[paused_true_during_pause.html] + type: testharness + expected: TIMEOUT + [audio events - paused property] + expected: FAIL + + [audio.paused should be true during pause event] + expected: NOTRUN + + [video events - paused property] + expected: FAIL + + [video.paused should be true during pause event] + expected: NOTRUN + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-to-other-document.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-to-other-document.html.ini new file mode 100644 index 00000000000..020a3ceebaa --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-to-other-document.html.ini @@ -0,0 +1,5 @@ +[pause-move-to-other-document.html] + type: testharness + [paused state when moving to other document] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-within-document.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-within-document.html.ini new file mode 100644 index 00000000000..39021603c70 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-within-document.html.ini @@ -0,0 +1,5 @@ +[pause-move-within-document.html] + type: testharness + [paused state when moving within a document] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document-networkState.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document-networkState.html.ini new file mode 100644 index 00000000000..9555bc2543e --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document-networkState.html.ini @@ -0,0 +1,5 @@ +[pause-remove-from-document-networkState.html] + type: testharness + [paused state when removing from a document when networkState is NETWORK_EMPTY] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document.html.ini new file mode 100644 index 00000000000..fd8fc8860ab --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document.html.ini @@ -0,0 +1,5 @@ +[pause-remove-from-document.html] + type: testharness + [paused state when removing from a document] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/play-in-detached-document.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/play-in-detached-document.html.ini new file mode 100644 index 00000000000..19ccf5ab94a --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/play-in-detached-document.html.ini @@ -0,0 +1,5 @@ +[play-in-detached-document.html] + type: testharness + [play() in detached document] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/playbackRate.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/playbackRate.html.ini new file mode 100644 index 00000000000..73933f83bf2 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/playbackRate.html.ini @@ -0,0 +1,9 @@ +[playbackRate.html] + type: testharness + expected: TIMEOUT + [playbackRate initial value] + expected: FAIL + + [setting playbackRate] + expected: TIMEOUT + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/preload_reflects_none_autoplay.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/preload_reflects_none_autoplay.html.ini new file mode 100644 index 00000000000..320b6d2199e --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/preload_reflects_none_autoplay.html.ini @@ -0,0 +1,8 @@ +[preload_reflects_none_autoplay.html] + type: testharness + [audio.preload - reflection test] + expected: FAIL + + [video.preload - reflection test] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/ready-states/autoplay.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/ready-states/autoplay.html.ini new file mode 100644 index 00000000000..30a6fe06aea --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/ready-states/autoplay.html.ini @@ -0,0 +1,32 @@ +[autoplay.html] + type: testharness + [audio.autoplay] + expected: FAIL + + [audio.autoplay and load()] + expected: FAIL + + [audio.autoplay and play()] + expected: FAIL + + [audio.autoplay and pause()] + expected: FAIL + + [audio.autoplay and internal pause steps] + expected: FAIL + + [video.autoplay] + expected: FAIL + + [video.autoplay and load()] + expected: FAIL + + [video.autoplay and play()] + expected: FAIL + + [video.autoplay and pause()] + expected: FAIL + + [video.autoplay and internal pause steps] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/seeking/seek-to-currentTime.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/seeking/seek-to-currentTime.html.ini new file mode 100644 index 00000000000..57802dcd9c9 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/seeking/seek-to-currentTime.html.ini @@ -0,0 +1,6 @@ +[seek-to-currentTime.html] + type: testharness + expected: TIMEOUT + [seek to currentTime] + expected: TIMEOUT + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/seeking/seek-to-max-value.htm.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/seeking/seek-to-max-value.htm.ini new file mode 100644 index 00000000000..ce89db5585d --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/seeking/seek-to-max-value.htm.ini @@ -0,0 +1,6 @@ +[seek-to-max-value.htm] + type: testharness + expected: TIMEOUT + [seek to Number.MAX_VALUE] + expected: TIMEOUT + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/seeking/seek-to-negative-time.htm.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/seeking/seek-to-negative-time.htm.ini new file mode 100644 index 00000000000..a53871348f9 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/seeking/seek-to-negative-time.htm.ini @@ -0,0 +1,6 @@ +[seek-to-negative-time.htm] + type: testharness + expected: TIMEOUT + [seek to negative time] + expected: TIMEOUT + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/synchronising-multiple-media-elements/media-controllers/task-source.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/synchronising-multiple-media-elements/media-controllers/task-source.html.ini new file mode 100644 index 00000000000..3c72c84f4c9 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/synchronising-multiple-media-elements/media-controllers/task-source.html.ini @@ -0,0 +1,5 @@ +[task-source.html] + type: testharness + [MediaController events task source] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/track/track-element/__dir__.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/track/track-element/__dir__.ini new file mode 100644 index 00000000000..dde8cfc6349 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/track/track-element/__dir__.ini @@ -0,0 +1 @@ +disabled: for now \ No newline at end of file diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/user-interface/muted.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/user-interface/muted.html.ini new file mode 100644 index 00000000000..c7c2988c68f --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/user-interface/muted.html.ini @@ -0,0 +1,65 @@ +[muted.html] + type: testharness + [getting audio.muted (parser-created)] + expected: FAIL + + [setting audio.muted (parser-created)] + expected: FAIL + + [getting audio.muted with muted="" (parser-created)] + expected: FAIL + + [setting audio.muted with muted="" (parser-created)] + expected: FAIL + + [getting video.muted (parser-created)] + expected: FAIL + + [setting video.muted (parser-created)] + expected: FAIL + + [getting video.muted with muted="" (parser-created)] + expected: FAIL + + [setting video.muted with muted="" (parser-created)] + expected: FAIL + + [getting video.muted with muted="" after load (parser-created)] + expected: FAIL + + [getting audio.muted (script-created)] + expected: FAIL + + [setting audio.muted (script-created)] + expected: FAIL + + [getting audio.muted with muted="" (script-created)] + expected: FAIL + + [setting audio.muted with muted="" (script-created)] + expected: FAIL + + [getting audio.muted with muted="" (innerHTML-created)] + expected: FAIL + + [getting audio.muted with muted="" (document.write-created)] + expected: FAIL + + [getting video.muted (script-created)] + expected: FAIL + + [setting video.muted (script-created)] + expected: FAIL + + [getting video.muted with muted="" (script-created)] + expected: FAIL + + [setting video.muted with muted="" (script-created)] + expected: FAIL + + [getting video.muted with muted="" (innerHTML-created)] + expected: FAIL + + [getting video.muted with muted="" (document.write-created)] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/video_loop_base.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/video_loop_base.html.ini new file mode 100644 index 00000000000..85f679af410 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/video_loop_base.html.ini @@ -0,0 +1,6 @@ +[video_loop_base.html] + type: testharness + expected: TIMEOUT + [Check if video.loop is set to true that expecting the seeking event is fired more than once] + expected: NOTRUN + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/video_volume_check.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/video_volume_check.html.ini new file mode 100644 index 00000000000..300c6c5db90 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/video_volume_check.html.ini @@ -0,0 +1,8 @@ +[video_volume_check.html] + type: testharness + [Check if media.volume is set to new value less than 0.0 that expecting an IndexSizeError exception is to be thrown] + expected: FAIL + + [Check if video.volume is set to new value greater than 1.0 that expecting an IndexSizeError exception is to be thrown] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/volume_nonfinite.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/volume_nonfinite.html.ini new file mode 100644 index 00000000000..1f75f5ba4a9 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/volume_nonfinite.html.ini @@ -0,0 +1,20 @@ +[volume_nonfinite.html] + type: testharness + [Setting audio.volume to NaN should throw a TypeError] + expected: FAIL + + [Setting audio.volume to Infinity should throw a TypeError] + expected: FAIL + + [Setting audio.volume to -Infinity should throw a TypeError] + expected: FAIL + + [Setting video.volume to NaN should throw a TypeError] + expected: FAIL + + [Setting video.volume to Infinity should throw a TypeError] + expected: FAIL + + [Setting video.volume to -Infinity should throw a TypeError] + expected: FAIL + From 5960fbe6048e74e6be5708f8326ef23f2708810e Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Sat, 7 Nov 2015 00:43:17 -0500 Subject: [PATCH 05/13] Implement load, canPlayType, and error APIs for media elements. --- components/script/dom/htmlmediaelement.rs | 40 +++++++++- components/script/dom/mediaerror.rs | 36 +++++++++ components/script/dom/mod.rs | 1 + .../dom/webidls/HTMLMediaElement.webidl | 8 +- .../script/dom/webidls/MediaError.webidl | 14 ++++ .../wpt/metadata/html/dom/interfaces.html.ini | 75 ------------------- .../media-elements/error-codes/error.html.ini | 6 -- .../mime-types/canPlayType.html.ini | 72 ++++++------------ ...nd-sub-image-2d-with-video-rgb565.html.ini | 4 +- ...-sub-image-2d-with-video-rgba4444.html.ini | 4 +- ...-sub-image-2d-with-video-rgba5551.html.ini | 4 +- ...image-and-sub-image-2d-with-video.html.ini | 4 +- .../wpt/mozilla/tests/mozilla/interfaces.html | 1 + 13 files changed, 121 insertions(+), 148 deletions(-) create mode 100644 components/script/dom/mediaerror.rs create mode 100644 components/script/dom/webidls/MediaError.webidl diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index d84e5be13cf..2f3dbe03ea5 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -6,17 +6,20 @@ use document_loader::LoadType; use dom::attr::Attr; use dom::bindings::cell::DOMRefCell; use dom::bindings::codegen::Bindings::AttrBinding::AttrMethods; +use dom::bindings::codegen::Bindings::HTMLMediaElementBinding::CanPlayTypeResult; use dom::bindings::codegen::Bindings::HTMLMediaElementBinding::HTMLMediaElementMethods; use dom::bindings::codegen::Bindings::HTMLMediaElementBinding::HTMLMediaElementConstants::*; +use dom::bindings::codegen::Bindings::MediaErrorBinding::MediaErrorConstants::*; use dom::bindings::global::GlobalRef; use dom::bindings::inheritance::Castable; -use dom::bindings::js::Root; +use dom::bindings::js::{Root, MutNullableHeap, JS}; use dom::bindings::refcounted::Trusted; use dom::document::Document; use dom::element::{Element, AttributeMutation}; use dom::event::{Event, EventBubbles, EventCancelable}; use dom::htmlelement::HTMLElement; use dom::htmlsourceelement::HTMLSourceElement; +use dom::mediaerror::MediaError; use dom::node::{window_from_node, document_from_node}; use dom::virtualmethods::VirtualMethods; use ipc_channel::ipc; @@ -110,6 +113,15 @@ impl AsyncResponseListener for HTMLMediaElementContext { elem.network_state.set(NETWORK_IDLE); elem.fire_simple_event("suspend"); + } else if elem.ready_state.get() != HAVE_NOTHING { + elem.error.set(Some(&*MediaError::new(&*window_from_node(&*elem), + MEDIA_ERR_NETWORK))); + + elem.network_state.set(NETWORK_IDLE); + + // TODO: update delay load flag + + elem.fire_simple_event("error"); } else { elem.queue_dedicated_media_source_failure_steps(); } @@ -149,6 +161,7 @@ pub struct HTMLMediaElement { current_src: DOMRefCell, generation_id: Cell, first_data_load: Cell, + error: MutNullableHeap>, } impl HTMLMediaElement { @@ -163,6 +176,7 @@ impl HTMLMediaElement { current_src: DOMRefCell::new("".to_owned()), generation_id: Cell::new(0), first_data_load: Cell::new(true), + error: Default::default(), } } @@ -372,7 +386,9 @@ impl HTMLMediaElement { // https://html.spec.whatwg.org/multipage/#dedicated-media-source-failure-steps fn dedicated_media_source_failure(&self) { - // TODO step 1 (error attribute) + // Step 1 + self.error.set(Some(&*MediaError::new(&*window_from_node(self), + MEDIA_ERR_SRC_NOT_SUPPORTED))); // TODO step 2 (forget resource tracks) @@ -426,7 +442,9 @@ impl HTMLMediaElement { } // TODO step 5 (playback rate) - // TODO step 6 (error/autoplaying) + // Step 6 + self.error.set(None); + // TODO autoplay flag // Step 7 let doc = document_from_node(self); @@ -454,6 +472,22 @@ impl HTMLMediaElementMethods for HTMLMediaElement { fn CurrentSrc(&self) -> DOMString { DOMString::from(self.current_src.borrow().clone()) } + + // https://html.spec.whatwg.org/multipage/#dom-media-load + fn Load(&self) { + self.media_element_load_algorithm(); + } + + // https://html.spec.whatwg.org/multipage/#dom-navigator-canplaytype + fn CanPlayType(&self, _type_: DOMString) -> CanPlayTypeResult { + // TODO: application/octet-stream + CanPlayTypeResult::Maybe + } + + // https://html.spec.whatwg.org/multipage/#dom-media-error + fn GetError(&self) -> Option> { + self.error.get() + } } impl VirtualMethods for HTMLMediaElement { diff --git a/components/script/dom/mediaerror.rs b/components/script/dom/mediaerror.rs new file mode 100644 index 00000000000..4d36ab4ec69 --- /dev/null +++ b/components/script/dom/mediaerror.rs @@ -0,0 +1,36 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * 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::bindings::codegen::Bindings::MediaErrorBinding::{self, MediaErrorMethods}; +use dom::bindings::global::GlobalRef; +use dom::bindings::js::Root; +use dom::bindings::reflector::{Reflector, reflect_dom_object}; +use dom::window::Window; + +#[dom_struct] +pub struct MediaError { + reflector_: Reflector, + code: u16, +} + +impl MediaError { + fn new_inherited(code: u16) -> MediaError { + MediaError { + reflector_: Reflector::new(), + code: code, + } + } + + pub fn new(window: &Window, code: u16) -> Root { + reflect_dom_object(box MediaError::new_inherited(code), + GlobalRef::Window(window), + MediaErrorBinding::Wrap) + } +} + +impl MediaErrorMethods for MediaError { + fn Code(&self) -> u16 { + self.code + } +} diff --git a/components/script/dom/mod.rs b/components/script/dom/mod.rs index 853ac520b9a..9d7480eee1a 100644 --- a/components/script/dom/mod.rs +++ b/components/script/dom/mod.rs @@ -341,6 +341,7 @@ pub mod htmlvideoelement; pub mod imagedata; pub mod keyboardevent; pub mod location; +pub mod mediaerror; pub mod messageevent; pub mod mimetype; pub mod mimetypearray; diff --git a/components/script/dom/webidls/HTMLMediaElement.webidl b/components/script/dom/webidls/HTMLMediaElement.webidl index 5515618d6a9..30127ffec62 100644 --- a/components/script/dom/webidls/HTMLMediaElement.webidl +++ b/components/script/dom/webidls/HTMLMediaElement.webidl @@ -3,12 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ // https://html.spec.whatwg.org/multipage/#htmlmediaelement -//enum CanPlayTypeResult { "" /* empty string */, "maybe", "probably" }; +enum CanPlayTypeResult { "" /* empty string */, "maybe", "probably" }; [Abstract] interface HTMLMediaElement : HTMLElement { // error state - //readonly attribute MediaError? error; + readonly attribute MediaError? error; // network state attribute DOMString src; @@ -21,8 +21,8 @@ interface HTMLMediaElement : HTMLElement { readonly attribute unsigned short networkState; // attribute DOMString preload; //readonly attribute TimeRanges buffered; - //void load(); - //CanPlayTypeResult canPlayType(DOMString type); + void load(); + CanPlayTypeResult canPlayType(DOMString type); // ready state const unsigned short HAVE_NOTHING = 0; diff --git a/components/script/dom/webidls/MediaError.webidl b/components/script/dom/webidls/MediaError.webidl new file mode 100644 index 00000000000..52210aa8c01 --- /dev/null +++ b/components/script/dom/webidls/MediaError.webidl @@ -0,0 +1,14 @@ +/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * 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/. */ + +// https://html.spec.whatwg.org/multipage/embedded-content.html#mediaerror + +interface MediaError { + const unsigned short MEDIA_ERR_ABORTED = 1; + const unsigned short MEDIA_ERR_NETWORK = 2; + const unsigned short MEDIA_ERR_DECODE = 3; + const unsigned short MEDIA_ERR_SRC_NOT_SUPPORTED = 4; + readonly attribute unsigned short code; +}; diff --git a/tests/wpt/metadata/html/dom/interfaces.html.ini b/tests/wpt/metadata/html/dom/interfaces.html.ini index 02218fc7498..fb2864fc5e2 100644 --- a/tests/wpt/metadata/html/dom/interfaces.html.ini +++ b/tests/wpt/metadata/html/dom/interfaces.html.ini @@ -2619,9 +2619,6 @@ [HTMLVideoElement interface: document.createElement("video") must inherit property "poster" with the proper type (4)] expected: FAIL - [HTMLMediaElement interface: document.createElement("video") must inherit property "error" with the proper type (0)] - expected: FAIL - [HTMLMediaElement interface: document.createElement("video") must inherit property "crossOrigin" with the proper type (3)] expected: FAIL @@ -2631,15 +2628,6 @@ [HTMLMediaElement interface: document.createElement("video") must inherit property "buffered" with the proper type (10)] expected: FAIL - [HTMLMediaElement interface: document.createElement("video") must inherit property "load" with the proper type (11)] - expected: FAIL - - [HTMLMediaElement interface: document.createElement("video") must inherit property "canPlayType" with the proper type (12)] - expected: FAIL - - [HTMLMediaElement interface: calling canPlayType(DOMString) on document.createElement("video") with too few arguments must throw TypeError] - expected: FAIL - [HTMLMediaElement interface: document.createElement("video") must inherit property "seeking" with the proper type (19)] expected: FAIL @@ -2721,9 +2709,6 @@ [HTMLMediaElement interface: calling addTextTrack(TextTrackKind,DOMString,DOMString) on document.createElement("video") with too few arguments must throw TypeError] expected: FAIL - [HTMLMediaElement interface: document.createElement("audio") must inherit property "error" with the proper type (0)] - expected: FAIL - [HTMLMediaElement interface: document.createElement("audio") must inherit property "crossOrigin" with the proper type (3)] expected: FAIL @@ -2733,15 +2718,6 @@ [HTMLMediaElement interface: document.createElement("audio") must inherit property "buffered" with the proper type (10)] expected: FAIL - [HTMLMediaElement interface: document.createElement("audio") must inherit property "load" with the proper type (11)] - expected: FAIL - - [HTMLMediaElement interface: document.createElement("audio") must inherit property "canPlayType" with the proper type (12)] - expected: FAIL - - [HTMLMediaElement interface: calling canPlayType(DOMString) on document.createElement("audio") with too few arguments must throw TypeError] - expected: FAIL - [HTMLMediaElement interface: document.createElement("audio") must inherit property "seeking" with the proper type (19)] expected: FAIL @@ -3078,9 +3054,6 @@ [HTMLTrackElement interface: document.createElement("track") must inherit property "track" with the proper type (10)] expected: FAIL - [HTMLMediaElement interface: attribute error] - expected: FAIL - [HTMLMediaElement interface: attribute crossOrigin] expected: FAIL @@ -3090,12 +3063,6 @@ [HTMLMediaElement interface: attribute buffered] expected: FAIL - [HTMLMediaElement interface: operation load()] - expected: FAIL - - [HTMLMediaElement interface: operation canPlayType(DOMString)] - expected: FAIL - [HTMLMediaElement interface: attribute seeking] expected: FAIL @@ -3171,45 +3138,6 @@ [HTMLMediaElement interface: operation addTextTrack(TextTrackKind,DOMString,DOMString)] expected: FAIL - [MediaError interface: existence and properties of interface object] - expected: FAIL - - [MediaError interface object length] - expected: FAIL - - [MediaError interface: existence and properties of interface prototype object] - expected: FAIL - - [MediaError interface: existence and properties of interface prototype object's "constructor" property] - expected: FAIL - - [MediaError interface: constant MEDIA_ERR_ABORTED on interface object] - expected: FAIL - - [MediaError interface: constant MEDIA_ERR_ABORTED on interface prototype object] - expected: FAIL - - [MediaError interface: constant MEDIA_ERR_NETWORK on interface object] - expected: FAIL - - [MediaError interface: constant MEDIA_ERR_NETWORK on interface prototype object] - expected: FAIL - - [MediaError interface: constant MEDIA_ERR_DECODE on interface object] - expected: FAIL - - [MediaError interface: constant MEDIA_ERR_DECODE on interface prototype object] - expected: FAIL - - [MediaError interface: constant MEDIA_ERR_SRC_NOT_SUPPORTED on interface object] - expected: FAIL - - [MediaError interface: constant MEDIA_ERR_SRC_NOT_SUPPORTED on interface prototype object] - expected: FAIL - - [MediaError interface: attribute code] - expected: FAIL - [MediaError must be primary interface of errorVideo.error] expected: FAIL @@ -8259,9 +8187,6 @@ [HTMLPictureElement interface object name] expected: FAIL - [MediaError interface object name] - expected: FAIL - [AudioTrackList interface object name] expected: FAIL diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/error-codes/error.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/error-codes/error.html.ini index 087a6500f65..4073dc3708e 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/error-codes/error.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/error-codes/error.html.ini @@ -1,18 +1,12 @@ [error.html] type: testharness expected: TIMEOUT - [audio.error initial value] - expected: FAIL - [audio.error after successful load] expected: TIMEOUT [audio.error after setting src to the empty string] expected: TIMEOUT - [video.error initial value] - expected: FAIL - [video.error after successful load] expected: TIMEOUT diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/mime-types/canPlayType.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/mime-types/canPlayType.html.ini index 76521be77f4..c5491bf470e 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/mime-types/canPlayType.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/mime-types/canPlayType.html.ini @@ -6,18 +6,12 @@ [video/x-new-fictional-format] expected: FAIL - [audio/mp4 (optional)] - expected: FAIL - [audio/mp4; codecs="mp4a.40.2" (optional)] expected: FAIL [audio/mp4 with bogus codec] expected: FAIL - [audio/ogg (optional)] - expected: FAIL - [audio/ogg; codecs="opus" (optional)] expected: FAIL @@ -27,18 +21,12 @@ [audio/ogg with bogus codec] expected: FAIL - [audio/wav (optional)] - expected: FAIL - [audio/wav; codecs="1" (optional)] expected: FAIL [audio/wav with bogus codec] expected: FAIL - [audio/webm (optional)] - expected: FAIL - [audio/webm; codecs="opus" (optional)] expected: FAIL @@ -48,27 +36,15 @@ [audio/webm with bogus codec] expected: FAIL - [video/3gpp (optional)] - expected: FAIL - [video/3gpp; codecs="samr" (optional)] expected: FAIL [video/3gpp; codecs="mp4v.20.8" (optional)] expected: FAIL - [video/3gpp codecs subset] - expected: FAIL - - [video/3gpp codecs order] - expected: FAIL - [video/3gpp with bogus codec] expected: FAIL - [video/mp4 (optional)] - expected: FAIL - [video/mp4; codecs="mp4a.40.2" (optional)] expected: FAIL @@ -90,18 +66,9 @@ [video/mp4; codecs="mp4v.20.240" (optional)] expected: FAIL - [video/mp4 codecs subset] - expected: FAIL - - [video/mp4 codecs order] - expected: FAIL - [video/mp4 with bogus codec] expected: FAIL - [video/ogg (optional)] - expected: FAIL - [video/ogg; codecs="opus" (optional)] expected: FAIL @@ -111,18 +78,9 @@ [video/ogg; codecs="theora" (optional)] expected: FAIL - [video/ogg codecs subset] - expected: FAIL - - [video/ogg codecs order] - expected: FAIL - [video/ogg with bogus codec] expected: FAIL - [video/webm (optional)] - expected: FAIL - [video/webm; codecs="opus" (optional)] expected: FAIL @@ -141,12 +99,30 @@ [video/webm; codecs="vp9.0" (optional)] expected: FAIL - [video/webm codecs subset] - expected: FAIL - - [video/webm codecs order] - expected: FAIL - [video/webm with bogus codec] expected: FAIL + [audio/mp4 with and without codecs] + expected: FAIL + + [audio/ogg with and without codecs] + expected: FAIL + + [audio/wav with and without codecs] + expected: FAIL + + [audio/webm with and without codecs] + expected: FAIL + + [video/3gpp with and without codecs] + expected: FAIL + + [video/mp4 with and without codecs] + expected: FAIL + + [video/ogg with and without codecs] + expected: FAIL + + [video/webm with and without codecs] + expected: FAIL + diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-video-rgb565.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-video-rgb565.html.ini index 3f5d2cb05f7..2a874e9abc7 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-video-rgb565.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-video-rgb565.html.ini @@ -1,5 +1,3 @@ [tex-image-and-sub-image-2d-with-video-rgb565.html] type: testharness - [WebGL test #0: video.canPlayType required method missing] - expected: FAIL - + expected: TIMEOUT diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-video-rgba4444.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-video-rgba4444.html.ini index 4b987faadd5..9be75537245 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-video-rgba4444.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-video-rgba4444.html.ini @@ -1,5 +1,3 @@ [tex-image-and-sub-image-2d-with-video-rgba4444.html] type: testharness - [WebGL test #0: video.canPlayType required method missing] - expected: FAIL - + expected: TIMEOUT diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-video-rgba5551.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-video-rgba5551.html.ini index 532feaa4817..757c5f89f21 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-video-rgba5551.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-video-rgba5551.html.ini @@ -1,8 +1,6 @@ [tex-image-and-sub-image-2d-with-video-rgba5551.html] type: testharness - [WebGL test #0: video.canPlayType required method missing] - expected: FAIL - + expected: TIMEOUT [WebGL test #0: Unable to fetch WebGL rendering context for Canvas] expected: FAIL diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-video.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-video.html.ini index 4fe82ebe56b..2f052c68478 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-video.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-video.html.ini @@ -1,8 +1,6 @@ [tex-image-and-sub-image-2d-with-video.html] type: testharness - [WebGL test #0: video.canPlayType required method missing] - expected: FAIL - + expected: TIMEOUT [WebGL test #0: Unable to fetch WebGL rendering context for Canvas] expected: FAIL diff --git a/tests/wpt/mozilla/tests/mozilla/interfaces.html b/tests/wpt/mozilla/tests/mozilla/interfaces.html index 31495c457f0..d4975865649 100644 --- a/tests/wpt/mozilla/tests/mozilla/interfaces.html +++ b/tests/wpt/mozilla/tests/mozilla/interfaces.html @@ -192,6 +192,7 @@ var interfaceNamesInGlobalScope = [ "Image", "KeyboardEvent", "Location", + "MediaError", "MessageEvent", "MimeType", "MimeTypeArray", From e3db11fd8b5e75dd566d904413ac3d74ad683598 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Sat, 7 Nov 2015 01:19:41 -0500 Subject: [PATCH 06/13] Implement play, pause, paused, and autoplay APIs. --- components/script/dom/htmlmediaelement.rs | 113 ++++++++- .../dom/webidls/HTMLMediaElement.webidl | 8 +- .../wpt/metadata/html/dom/interfaces.html.ini | 36 --- .../html/dom/reflection-embedded.html.ini | 216 ------------------ .../media-elements/event_pause.html.ini | 9 - .../event_pause_noautoplay.html.ini | 15 -- .../media-elements/event_play.html.ini | 9 - .../event_play_noautoplay.html.ini | 15 -- .../event_playing_noautoplay.html.ini | 8 - .../event_timeupdate_noautoplay.html.ini | 6 - .../autoplay-overrides-preload.html.ini | 14 -- ...ction-invoke-set-src-networkState.html.ini | 5 - .../paused_false_during_play.html.ini | 9 - .../paused_true_during_pause.html.ini | 15 -- .../pause-move-to-other-document.html.ini | 3 +- .../pause-move-within-document.html.ini | 3 +- ...remove-from-document-networkState.html.ini | 3 +- .../pause-remove-from-document.html.ini | 3 +- .../play-in-detached-document.html.ini | 3 +- .../ready-states/autoplay.html.ini | 24 -- 20 files changed, 118 insertions(+), 399 deletions(-) delete mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_pause.html.ini delete mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_pause_noautoplay.html.ini delete mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_play.html.ini delete mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_play_noautoplay.html.ini delete mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_playing_noautoplay.html.ini delete mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/autoplay-overrides-preload.html.ini delete mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-networkState.html.ini delete mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/paused_false_during_play.html.ini delete mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/paused_true_during_pause.html.ini diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index 2f3dbe03ea5..e419dde0fea 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -162,6 +162,8 @@ pub struct HTMLMediaElement { generation_id: Cell, first_data_load: Cell, error: MutNullableHeap>, + paused: Cell, + autoplaying: Cell, } impl HTMLMediaElement { @@ -177,6 +179,8 @@ impl HTMLMediaElement { generation_id: Cell::new(0), first_data_load: Cell::new(true), error: Default::default(), + paused: Cell::new(true), + autoplaying: Cell::new(true), } } @@ -185,6 +189,28 @@ impl HTMLMediaElement { &self.htmlelement } + // https://html.spec.whatwg.org/multipage/#playing-the-media-resource:internal-pause-steps + fn internal_pause_steps(&self) { + // Step 1 + self.autoplaying.set(false); + + // Step 2 + if !self.Paused() { + // 2.1 + self.paused.set(true); + + // 2.2 + self.queue_fire_simple_event("timeupdate"); + + // 2.3 + self.queue_fire_simple_event("pause"); + + // TODO 2.4 (official playback position) + } + + // TODO step 3 (media controller) + } + fn queue_fire_simple_event(&self, type_: &'static str) { let win = window_from_node(self); let task = FireSimpleEventTask::new(self, type_); @@ -260,11 +286,19 @@ impl HTMLMediaElement { if old_ready_state <= HAVE_CURRENT_DATA { self.queue_fire_simple_event("canplay"); - //TODO: check paused state - self.queue_fire_simple_event("playing"); + if !self.Paused() { + self.queue_fire_simple_event("playing"); + } } - // TODO: autoplay-related logic + if self.autoplaying.get() && + self.Paused() && + self.Autoplay() { + self.paused.set(false); + // TODO: show poster + self.queue_fire_simple_event("play"); + self.queue_fire_simple_event("playing"); + } self.queue_fire_simple_event("canplaythrough"); } @@ -274,7 +308,7 @@ impl HTMLMediaElement { } // https://html.spec.whatwg.org/multipage/#concept-media-load-algorithm - fn invoke_resource_selection_algorithm(&self, base_url: Url) { + fn invoke_resource_selection_algorithm(&self) { // Step 1 self.network_state.set(NETWORK_NO_SOURCE); @@ -282,7 +316,8 @@ impl HTMLMediaElement { // TODO step 3 (delay load event) // Step 4 - ScriptThread::await_stable_state(ResourceSelectionTask::new(self, base_url)); + let doc = document_from_node(self); + ScriptThread::await_stable_state(ResourceSelectionTask::new(self, doc.base_url())); } // https://html.spec.whatwg.org/multipage/#concept-media-load-algorithm @@ -434,7 +469,9 @@ impl HTMLMediaElement { // 4.4 self.change_ready_state(HAVE_NOTHING); - // TODO 4.5 (paused) + if !self.Paused() { + self.paused.set(true); + } // TODO 4.6 (seeking) // TODO 4.7 (playback position) // TODO 4.8 (timeline offset) @@ -444,11 +481,10 @@ impl HTMLMediaElement { // TODO step 5 (playback rate) // Step 6 self.error.set(None); - // TODO autoplay flag + self.autoplaying.set(true); // Step 7 - let doc = document_from_node(self); - self.invoke_resource_selection_algorithm(doc.base_url()); + self.invoke_resource_selection_algorithm(); // TODO step 8 (stop previously playing resource) } @@ -463,6 +499,11 @@ impl HTMLMediaElementMethods for HTMLMediaElement { self.ready_state.get() } + // https://html.spec.whatwg.org/multipage/#dom-media-autoplay + make_bool_getter!(Autoplay, "autoplay"); + // https://html.spec.whatwg.org/multipage/#dom-media-autoplay + make_bool_setter!(SetAutoplay, "autoplay"); + // https://html.spec.whatwg.org/multipage/#dom-media-src make_url_getter!(Src, "src"); // https://html.spec.whatwg.org/multipage/#dom-media-src @@ -488,6 +529,60 @@ impl HTMLMediaElementMethods for HTMLMediaElement { fn GetError(&self) -> Option> { self.error.get() } + + // https://html.spec.whatwg.org/multipage/#dom-media-play + fn Play(&self) { + // Step 1 + if self.network_state.get() == NETWORK_EMPTY { + self.invoke_resource_selection_algorithm(); + } + + // TODO step 2 (seek backwards) + + // TODO step 3 (media controller) + + // Step 4 + if self.Paused() { + // 4.1 + self.paused.set(false); + + // TODO 4.2 (show poster) + + // 4.3 + self.queue_fire_simple_event("play"); + + // 4.4 + let state = self.ready_state.get(); + if state == HAVE_NOTHING || + state == HAVE_METADATA || + state == HAVE_CURRENT_DATA { + self.queue_fire_simple_event("waiting"); + } else { + self.queue_fire_simple_event("playing"); + } + + // 4.5 + self.autoplaying.set(false); + + // TODO 4.6 (media controller) + } + } + + // https://html.spec.whatwg.org/multipage/#dom-media-pause + fn Pause(&self) { + // Step 1 + if self.network_state.get() == NETWORK_EMPTY { + self.invoke_resource_selection_algorithm(); + } + + // Step 2 + self.internal_pause_steps(); + } + + // https://html.spec.whatwg.org/multipage/#dom-media-paused + fn Paused(&self) -> bool { + self.paused.get() + } } impl VirtualMethods for HTMLMediaElement { diff --git a/components/script/dom/webidls/HTMLMediaElement.webidl b/components/script/dom/webidls/HTMLMediaElement.webidl index 30127ffec62..ba81478be46 100644 --- a/components/script/dom/webidls/HTMLMediaElement.webidl +++ b/components/script/dom/webidls/HTMLMediaElement.webidl @@ -38,16 +38,16 @@ interface HTMLMediaElement : HTMLElement { //void fastSeek(double time); //readonly attribute unrestricted double duration; //Date getStartDate(); - //readonly attribute boolean paused; + readonly attribute boolean paused; // attribute double defaultPlaybackRate; // attribute double playbackRate; //readonly attribute TimeRanges played; //readonly attribute TimeRanges seekable; //readonly attribute boolean ended; - // attribute boolean autoplay; + attribute boolean autoplay; // attribute boolean loop; - //void play(); - //void pause(); + void play(); + void pause(); // media controller // attribute DOMString mediaGroup; diff --git a/tests/wpt/metadata/html/dom/interfaces.html.ini b/tests/wpt/metadata/html/dom/interfaces.html.ini index fb2864fc5e2..290d2e947fc 100644 --- a/tests/wpt/metadata/html/dom/interfaces.html.ini +++ b/tests/wpt/metadata/html/dom/interfaces.html.ini @@ -2646,9 +2646,6 @@ [HTMLMediaElement interface: document.createElement("video") must inherit property "getStartDate" with the proper type (23)] expected: FAIL - [HTMLMediaElement interface: document.createElement("video") must inherit property "paused" with the proper type (24)] - expected: FAIL - [HTMLMediaElement interface: document.createElement("video") must inherit property "defaultPlaybackRate" with the proper type (25)] expected: FAIL @@ -2664,18 +2661,9 @@ [HTMLMediaElement interface: document.createElement("video") must inherit property "ended" with the proper type (29)] expected: FAIL - [HTMLMediaElement interface: document.createElement("video") must inherit property "autoplay" with the proper type (30)] - expected: FAIL - [HTMLMediaElement interface: document.createElement("video") must inherit property "loop" with the proper type (31)] expected: FAIL - [HTMLMediaElement interface: document.createElement("video") must inherit property "play" with the proper type (32)] - expected: FAIL - - [HTMLMediaElement interface: document.createElement("video") must inherit property "pause" with the proper type (33)] - expected: FAIL - [HTMLMediaElement interface: document.createElement("video") must inherit property "mediaGroup" with the proper type (34)] expected: FAIL @@ -2736,9 +2724,6 @@ [HTMLMediaElement interface: document.createElement("audio") must inherit property "getStartDate" with the proper type (23)] expected: FAIL - [HTMLMediaElement interface: document.createElement("audio") must inherit property "paused" with the proper type (24)] - expected: FAIL - [HTMLMediaElement interface: document.createElement("audio") must inherit property "defaultPlaybackRate" with the proper type (25)] expected: FAIL @@ -2754,18 +2739,9 @@ [HTMLMediaElement interface: document.createElement("audio") must inherit property "ended" with the proper type (29)] expected: FAIL - [HTMLMediaElement interface: document.createElement("audio") must inherit property "autoplay" with the proper type (30)] - expected: FAIL - [HTMLMediaElement interface: document.createElement("audio") must inherit property "loop" with the proper type (31)] expected: FAIL - [HTMLMediaElement interface: document.createElement("audio") must inherit property "play" with the proper type (32)] - expected: FAIL - - [HTMLMediaElement interface: document.createElement("audio") must inherit property "pause" with the proper type (33)] - expected: FAIL - [HTMLMediaElement interface: document.createElement("audio") must inherit property "mediaGroup" with the proper type (34)] expected: FAIL @@ -3078,9 +3054,6 @@ [HTMLMediaElement interface: operation getStartDate()] expected: FAIL - [HTMLMediaElement interface: attribute paused] - expected: FAIL - [HTMLMediaElement interface: attribute defaultPlaybackRate] expected: FAIL @@ -3096,18 +3069,9 @@ [HTMLMediaElement interface: attribute ended] expected: FAIL - [HTMLMediaElement interface: attribute autoplay] - expected: FAIL - [HTMLMediaElement interface: attribute loop] expected: FAIL - [HTMLMediaElement interface: operation play()] - expected: FAIL - - [HTMLMediaElement interface: operation pause()] - expected: FAIL - [HTMLMediaElement interface: attribute mediaGroup] 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 f3c8293fffc..adb86b793cb 100644 --- a/tests/wpt/metadata/html/dom/reflection-embedded.html.ini +++ b/tests/wpt/metadata/html/dom/reflection-embedded.html.ini @@ -9759,114 +9759,6 @@ [video.preload: IDL set to "AUTO" followed by IDL get] expected: FAIL - [video.autoplay: typeof IDL attribute] - expected: FAIL - - [video.autoplay: IDL get with DOM attribute unset] - expected: FAIL - - [video.autoplay: setAttribute() to "" followed by IDL get] - expected: FAIL - - [video.autoplay: setAttribute() to " foo " followed by IDL get] - expected: FAIL - - [video.autoplay: setAttribute() to undefined followed by IDL get] - expected: FAIL - - [video.autoplay: setAttribute() to null followed by IDL get] - expected: FAIL - - [video.autoplay: setAttribute() to 7 followed by IDL get] - expected: FAIL - - [video.autoplay: setAttribute() to 1.5 followed by IDL get] - expected: FAIL - - [video.autoplay: setAttribute() to true followed by IDL get] - expected: FAIL - - [video.autoplay: setAttribute() to false followed by IDL get] - expected: FAIL - - [video.autoplay: setAttribute() to object "[object Object\]" followed by IDL get] - expected: FAIL - - [video.autoplay: setAttribute() to NaN followed by IDL get] - expected: FAIL - - [video.autoplay: setAttribute() to Infinity followed by IDL get] - expected: FAIL - - [video.autoplay: setAttribute() to -Infinity followed by IDL get] - expected: FAIL - - [video.autoplay: setAttribute() to "\\0" followed by IDL get] - expected: FAIL - - [video.autoplay: setAttribute() to object "test-toString" followed by IDL get] - expected: FAIL - - [video.autoplay: setAttribute() to object "test-valueOf" followed by IDL get] - expected: FAIL - - [video.autoplay: setAttribute() to "autoplay" followed by IDL get] - expected: FAIL - - [video.autoplay: IDL set to "" followed by hasAttribute()] - expected: FAIL - - [video.autoplay: IDL set to "" followed by IDL get] - expected: FAIL - - [video.autoplay: IDL set to " foo " followed by IDL get] - expected: FAIL - - [video.autoplay: IDL set to undefined followed by hasAttribute()] - expected: FAIL - - [video.autoplay: IDL set to undefined followed by IDL get] - expected: FAIL - - [video.autoplay: IDL set to null followed by hasAttribute()] - expected: FAIL - - [video.autoplay: IDL set to null followed by IDL get] - expected: FAIL - - [video.autoplay: IDL set to 7 followed by IDL get] - expected: FAIL - - [video.autoplay: IDL set to 1.5 followed by IDL get] - expected: FAIL - - [video.autoplay: IDL set to false followed by hasAttribute()] - expected: FAIL - - [video.autoplay: IDL set to object "[object Object\]" followed by IDL get] - expected: FAIL - - [video.autoplay: IDL set to NaN followed by hasAttribute()] - expected: FAIL - - [video.autoplay: IDL set to NaN followed by IDL get] - expected: FAIL - - [video.autoplay: IDL set to Infinity followed by IDL get] - expected: FAIL - - [video.autoplay: IDL set to -Infinity followed by IDL get] - expected: FAIL - - [video.autoplay: IDL set to "\\0" followed by IDL get] - expected: FAIL - - [video.autoplay: IDL set to object "test-toString" followed by IDL get] - expected: FAIL - - [video.autoplay: IDL set to object "test-valueOf" followed by IDL get] - expected: FAIL - [video.loop: typeof IDL attribute] expected: FAIL @@ -11907,114 +11799,6 @@ [audio.preload: IDL set to "AUTO" followed by IDL get] expected: FAIL - [audio.autoplay: typeof IDL attribute] - expected: FAIL - - [audio.autoplay: IDL get with DOM attribute unset] - expected: FAIL - - [audio.autoplay: setAttribute() to "" followed by IDL get] - expected: FAIL - - [audio.autoplay: setAttribute() to " foo " followed by IDL get] - expected: FAIL - - [audio.autoplay: setAttribute() to undefined followed by IDL get] - expected: FAIL - - [audio.autoplay: setAttribute() to null followed by IDL get] - expected: FAIL - - [audio.autoplay: setAttribute() to 7 followed by IDL get] - expected: FAIL - - [audio.autoplay: setAttribute() to 1.5 followed by IDL get] - expected: FAIL - - [audio.autoplay: setAttribute() to true followed by IDL get] - expected: FAIL - - [audio.autoplay: setAttribute() to false followed by IDL get] - expected: FAIL - - [audio.autoplay: setAttribute() to object "[object Object\]" followed by IDL get] - expected: FAIL - - [audio.autoplay: setAttribute() to NaN followed by IDL get] - expected: FAIL - - [audio.autoplay: setAttribute() to Infinity followed by IDL get] - expected: FAIL - - [audio.autoplay: setAttribute() to -Infinity followed by IDL get] - expected: FAIL - - [audio.autoplay: setAttribute() to "\\0" followed by IDL get] - expected: FAIL - - [audio.autoplay: setAttribute() to object "test-toString" followed by IDL get] - expected: FAIL - - [audio.autoplay: setAttribute() to object "test-valueOf" followed by IDL get] - expected: FAIL - - [audio.autoplay: setAttribute() to "autoplay" followed by IDL get] - expected: FAIL - - [audio.autoplay: IDL set to "" followed by hasAttribute()] - expected: FAIL - - [audio.autoplay: IDL set to "" followed by IDL get] - expected: FAIL - - [audio.autoplay: IDL set to " foo " followed by IDL get] - expected: FAIL - - [audio.autoplay: IDL set to undefined followed by hasAttribute()] - expected: FAIL - - [audio.autoplay: IDL set to undefined followed by IDL get] - expected: FAIL - - [audio.autoplay: IDL set to null followed by hasAttribute()] - expected: FAIL - - [audio.autoplay: IDL set to null followed by IDL get] - expected: FAIL - - [audio.autoplay: IDL set to 7 followed by IDL get] - expected: FAIL - - [audio.autoplay: IDL set to 1.5 followed by IDL get] - expected: FAIL - - [audio.autoplay: IDL set to false followed by hasAttribute()] - expected: FAIL - - [audio.autoplay: IDL set to object "[object Object\]" followed by IDL get] - expected: FAIL - - [audio.autoplay: IDL set to NaN followed by hasAttribute()] - expected: FAIL - - [audio.autoplay: IDL set to NaN followed by IDL get] - expected: FAIL - - [audio.autoplay: IDL set to Infinity followed by IDL get] - expected: FAIL - - [audio.autoplay: IDL set to -Infinity followed by IDL get] - expected: FAIL - - [audio.autoplay: IDL set to "\\0" followed by IDL get] - expected: FAIL - - [audio.autoplay: IDL set to object "test-toString" followed by IDL get] - expected: FAIL - - [audio.autoplay: IDL set to object "test-valueOf" followed by IDL get] - expected: FAIL - [audio.loop: typeof IDL attribute] expected: FAIL diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_pause.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_pause.html.ini deleted file mode 100644 index ea9eaeadb65..00000000000 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_pause.html.ini +++ /dev/null @@ -1,9 +0,0 @@ -[event_pause.html] - type: testharness - expected: TIMEOUT - [calling pause() on autoplay audio should trigger pause event] - expected: NOTRUN - - [calling pause() on autoplay video should trigger pause event] - expected: NOTRUN - diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_pause_noautoplay.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_pause_noautoplay.html.ini deleted file mode 100644 index 8301081a3f8..00000000000 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_pause_noautoplay.html.ini +++ /dev/null @@ -1,15 +0,0 @@ -[event_pause_noautoplay.html] - type: testharness - expected: TIMEOUT - [audio events - pause] - expected: FAIL - - [calling play() then pause() on non-autoplay audio should trigger pause event] - expected: NOTRUN - - [video events - pause] - expected: FAIL - - [calling play() then pause() on non-autoplay video should trigger pause event] - expected: NOTRUN - diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_play.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_play.html.ini deleted file mode 100644 index e692bd69d4c..00000000000 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_play.html.ini +++ /dev/null @@ -1,9 +0,0 @@ -[event_play.html] - type: testharness - expected: TIMEOUT - [setting src attribute on autoplay audio should trigger play event] - expected: NOTRUN - - [setting src attribute on autoplay video should trigger play event] - expected: NOTRUN - diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_play_noautoplay.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_play_noautoplay.html.ini deleted file mode 100644 index 2b63fff4d80..00000000000 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_play_noautoplay.html.ini +++ /dev/null @@ -1,15 +0,0 @@ -[event_play_noautoplay.html] - type: testharness - expected: TIMEOUT - [audio events - play] - expected: FAIL - - [calling play() on audio should trigger play event] - expected: NOTRUN - - [video events - play] - expected: FAIL - - [calling play() on video should trigger play event] - expected: NOTRUN - diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_playing_noautoplay.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_playing_noautoplay.html.ini deleted file mode 100644 index d677d4fa136..00000000000 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_playing_noautoplay.html.ini +++ /dev/null @@ -1,8 +0,0 @@ -[event_playing_noautoplay.html] - type: testharness - [audio events - playing] - expected: FAIL - - [video events - playing] - expected: FAIL - diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html.ini index 53dce24c690..22d1f1d6900 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html.ini @@ -1,15 +1,9 @@ [event_timeupdate_noautoplay.html] type: testharness expected: TIMEOUT - [audio events - timeupdate] - expected: FAIL - [calling play() on a sufficiently long audio should trigger timeupdate event] expected: NOTRUN - [video events - timeupdate] - expected: FAIL - [calling play() on a sufficiently long video should trigger timeupdate event] expected: NOTRUN diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/autoplay-overrides-preload.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/autoplay-overrides-preload.html.ini deleted file mode 100644 index 566ab27894d..00000000000 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/autoplay-overrides-preload.html.ini +++ /dev/null @@ -1,14 +0,0 @@ -[autoplay-overrides-preload.html] - type: testharness - [autoplay (set first) overrides preload "none"] - expected: FAIL - - [autoplay (set last) overrides preload "none"] - expected: FAIL - - [autoplay (set first) overrides preload "metadata"] - expected: FAIL - - [autoplay (set last) overrides preload "metadata"] - expected: FAIL - diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-networkState.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-networkState.html.ini deleted file mode 100644 index 2d8258abf78..00000000000 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-networkState.html.ini +++ /dev/null @@ -1,5 +0,0 @@ -[resource-selection-invoke-set-src-networkState.html] - type: testharness - [invoking load by setting src when networkState is not NETWORK_EMPTY] - expected: FAIL - diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/paused_false_during_play.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/paused_false_during_play.html.ini deleted file mode 100644 index d73cb8ba85a..00000000000 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/paused_false_during_play.html.ini +++ /dev/null @@ -1,9 +0,0 @@ -[paused_false_during_play.html] - type: testharness - expected: TIMEOUT - [audio.paused should be false during play event] - expected: NOTRUN - - [video.paused should be false during play event] - expected: NOTRUN - diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/paused_true_during_pause.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/paused_true_during_pause.html.ini deleted file mode 100644 index ae591b69432..00000000000 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/paused_true_during_pause.html.ini +++ /dev/null @@ -1,15 +0,0 @@ -[paused_true_during_pause.html] - type: testharness - expected: TIMEOUT - [audio events - paused property] - expected: FAIL - - [audio.paused should be true during pause event] - expected: NOTRUN - - [video events - paused property] - expected: FAIL - - [video.paused should be true during pause event] - expected: NOTRUN - diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-to-other-document.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-to-other-document.html.ini index 020a3ceebaa..7b90f687874 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-to-other-document.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-to-other-document.html.ini @@ -1,5 +1,6 @@ [pause-move-to-other-document.html] type: testharness + expected: TIMEOUT [paused state when moving to other document] - expected: FAIL + expected: TIMEOUT diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-within-document.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-within-document.html.ini index 39021603c70..11d7f005539 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-within-document.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-within-document.html.ini @@ -1,5 +1,6 @@ [pause-move-within-document.html] type: testharness + expected: TIMEOUT [paused state when moving within a document] - expected: FAIL + expected: TIMEOUT diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document-networkState.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document-networkState.html.ini index 9555bc2543e..806dc781bee 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document-networkState.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document-networkState.html.ini @@ -1,5 +1,6 @@ [pause-remove-from-document-networkState.html] type: testharness + expected: TIMEOUT [paused state when removing from a document when networkState is NETWORK_EMPTY] - expected: FAIL + expected: TIMEOUT diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document.html.ini index fd8fc8860ab..51811a2a184 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document.html.ini @@ -1,5 +1,6 @@ [pause-remove-from-document.html] type: testharness + expected: TIMEOUT [paused state when removing from a document] - expected: FAIL + expected: TIMEOUT diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/play-in-detached-document.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/play-in-detached-document.html.ini index 19ccf5ab94a..4e5368e2380 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/play-in-detached-document.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/play-in-detached-document.html.ini @@ -1,5 +1,6 @@ [play-in-detached-document.html] type: testharness + expected: TIMEOUT [play() in detached document] - expected: FAIL + expected: TIMEOUT diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/ready-states/autoplay.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/ready-states/autoplay.html.ini index 30a6fe06aea..a7fe6814e76 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/ready-states/autoplay.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/ready-states/autoplay.html.ini @@ -1,32 +1,8 @@ [autoplay.html] type: testharness - [audio.autoplay] - expected: FAIL - - [audio.autoplay and load()] - expected: FAIL - - [audio.autoplay and play()] - expected: FAIL - - [audio.autoplay and pause()] - expected: FAIL - [audio.autoplay and internal pause steps] expected: FAIL - [video.autoplay] - expected: FAIL - - [video.autoplay and load()] - expected: FAIL - - [video.autoplay and play()] - expected: FAIL - - [video.autoplay and pause()] - expected: FAIL - [video.autoplay and internal pause steps] expected: FAIL From d718da1c6abe083c602dcbe39d586c845f5817ef Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Sat, 7 Nov 2015 11:36:58 -0500 Subject: [PATCH 07/13] Pause media elements when they're removed from the document. --- components/script/dom/htmlmediaelement.rs | 32 ++++++++++++++++++- .../ready-states/autoplay.html.ini | 8 ----- 2 files changed, 31 insertions(+), 9 deletions(-) delete mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/ready-states/autoplay.html.ini diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index e419dde0fea..928c0ed6e93 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -20,7 +20,7 @@ use dom::event::{Event, EventBubbles, EventCancelable}; use dom::htmlelement::HTMLElement; use dom::htmlsourceelement::HTMLSourceElement; use dom::mediaerror::MediaError; -use dom::node::{window_from_node, document_from_node}; +use dom::node::{window_from_node, document_from_node, Node, UnbindContext}; use dom::virtualmethods::VirtualMethods; use ipc_channel::ipc; use ipc_channel::router::ROUTER; @@ -602,6 +602,15 @@ impl VirtualMethods for HTMLMediaElement { _ => (), }; } + + // https://html.spec.whatwg.org/multipage/#playing-the-media-resource:media-element-75 + fn unbind_from_tree(&self, context: &UnbindContext) { + self.super_type().unwrap().unbind_from_tree(context); + + if context.tree_in_doc { + ScriptThread::await_stable_state(PauseIfNotInDocumentTask::new(self)); + } + } } struct FireSimpleEventTask { @@ -663,6 +672,27 @@ impl Runnable for DedicatedMediaSourceFailureTask { } } +struct PauseIfNotInDocumentTask { + elem: Trusted, +} + +impl PauseIfNotInDocumentTask { + fn new(elem: &HTMLMediaElement) -> PauseIfNotInDocumentTask { + PauseIfNotInDocumentTask { + elem: Trusted::new(elem), + } + } +} + +impl Runnable for PauseIfNotInDocumentTask { + fn handler(self: Box) { + let elem = self.elem.root(); + if !elem.upcast::().is_in_doc() { + elem.internal_pause_steps(); + } + } +} + enum ResourceSelectionMode { Object, Attribute(String), diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/ready-states/autoplay.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/ready-states/autoplay.html.ini deleted file mode 100644 index a7fe6814e76..00000000000 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/ready-states/autoplay.html.ini +++ /dev/null @@ -1,8 +0,0 @@ -[autoplay.html] - type: testharness - [audio.autoplay and internal pause steps] - expected: FAIL - - [video.autoplay and internal pause steps] - expected: FAIL - From a80320e24ed885ac8dfbe52507efed7fd14a8635 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Sat, 7 Nov 2015 12:29:44 -0500 Subject: [PATCH 08/13] Add event handlers for media-related events. --- components/script/dom/macros.rs | 13 ++ .../script/dom/webidls/EventHandler.webidl | 16 +- .../wpt/metadata/html/dom/interfaces.html.ini | 195 ------------------ .../media-elements/error-codes/error.html.ini | 6 - .../pause-move-to-other-document.html.ini | 3 +- .../pause-move-within-document.html.ini | 6 - ...remove-from-document-networkState.html.ini | 6 - .../pause-remove-from-document.html.ini | 3 +- 8 files changed, 30 insertions(+), 218 deletions(-) delete mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-within-document.html.ini delete mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document-networkState.html.ini diff --git a/components/script/dom/macros.rs b/components/script/dom/macros.rs index fa3fd87e004..cf93b72f985 100644 --- a/components/script/dom/macros.rs +++ b/components/script/dom/macros.rs @@ -347,17 +347,30 @@ macro_rules! global_event_handlers( ); (NoOnload) => ( + event_handler!(abort, GetOnabort, SetOnabort); + event_handler!(canplay, GetOncanplay, SetOncanplay); + event_handler!(canplaythrough, GetOncanplaythrough, SetOncanplaythrough); event_handler!(change, GetOnchange, SetOnchange); event_handler!(click, GetOnclick, SetOnclick); event_handler!(dblclick, GetOndblclick, SetOndblclick); + event_handler!(emptied, GetOnemptied, SetOnemptied); error_event_handler!(error, GetOnerror, SetOnerror); event_handler!(input, GetOninput, SetOninput); event_handler!(keydown, GetOnkeydown, SetOnkeydown); event_handler!(keypress, GetOnkeypress, SetOnkeypress); event_handler!(keyup, GetOnkeyup, SetOnkeyup); + event_handler!(loadeddata, GetOnloadeddata, SetOnloadeddata); + event_handler!(loadedmetata, GetOnloadedmetadata, SetOnloadedmetadata); event_handler!(mouseover, GetOnmouseover, SetOnmouseover); + event_handler!(pause, GetOnpause, SetOnpause); + event_handler!(play, GetOnplay, SetOnplay); + event_handler!(playing, GetOnplaying, SetOnplaying); + event_handler!(progress, GetOnprogress, SetOnprogress); event_handler!(reset, GetOnreset, SetOnreset); event_handler!(submit, GetOnsubmit, SetOnsubmit); + event_handler!(suspend, GetOnsuspend, SetOnsuspend); + event_handler!(timeupdate, GetOntimeupdate, SetOntimeupdate); event_handler!(toggle, GetOntoggle, SetOntoggle); + event_handler!(waiting, GetOnwaiting, SetOnwaiting); ) ); diff --git a/components/script/dom/webidls/EventHandler.webidl b/components/script/dom/webidls/EventHandler.webidl index f001f0d184d..fa42b757cab 100644 --- a/components/script/dom/webidls/EventHandler.webidl +++ b/components/script/dom/webidls/EventHandler.webidl @@ -20,26 +20,40 @@ callback OnErrorEventHandlerNonNull = any ((Event or DOMString) event, optional optional any error); typedef OnErrorEventHandlerNonNull? OnErrorEventHandler; +// https://html.spec.whatwg.org/multipage/#globaleventhandlers [NoInterfaceObject] interface GlobalEventHandlers { + attribute EventHandler onabort; attribute EventHandler onblur; + attribute EventHandler oncanplay; + attribute EventHandler oncanplaythrough; attribute EventHandler onchange; attribute EventHandler onclick; attribute EventHandler ondblclick; + attribute EventHandler onemptied; attribute OnErrorEventHandler onerror; attribute EventHandler oninput; attribute EventHandler onkeydown; attribute EventHandler onkeypress; attribute EventHandler onkeyup; attribute EventHandler onload; + attribute EventHandler onloadeddata; + attribute EventHandler onloadedmetadata; attribute EventHandler onmouseover; + attribute EventHandler onpause; + attribute EventHandler onplay; + attribute EventHandler onplaying; + attribute EventHandler onprogress; attribute EventHandler onreset; attribute EventHandler onresize; attribute EventHandler onsubmit; + attribute EventHandler onsuspend; + attribute EventHandler ontimeupdate; attribute EventHandler ontoggle; - + attribute EventHandler onwaiting; }; +// https://html.spec.whatwg.org/multipage/#windoweventhandlers [NoInterfaceObject] interface WindowEventHandlers { attribute EventHandler onunload; diff --git a/tests/wpt/metadata/html/dom/interfaces.html.ini b/tests/wpt/metadata/html/dom/interfaces.html.ini index 290d2e947fc..78f775ca587 100644 --- a/tests/wpt/metadata/html/dom/interfaces.html.ini +++ b/tests/wpt/metadata/html/dom/interfaces.html.ini @@ -66,9 +66,6 @@ [Document interface: attribute all] expected: FAIL - [Document interface: attribute onabort] - expected: FAIL - [Document interface: attribute onautocomplete] expected: FAIL @@ -78,12 +75,6 @@ [Document interface: attribute oncancel] expected: FAIL - [Document interface: attribute oncanplay] - expected: FAIL - - [Document interface: attribute oncanplaythrough] - expected: FAIL - [Document interface: attribute onclose] expected: FAIL @@ -120,9 +111,6 @@ [Document interface: attribute ondurationchange] expected: FAIL - [Document interface: attribute onemptied] - expected: FAIL - [Document interface: attribute onended] expected: FAIL @@ -132,12 +120,6 @@ [Document interface: attribute oninvalid] expected: FAIL - [Document interface: attribute onloadeddata] - expected: FAIL - - [Document interface: attribute onloadedmetadata] - expected: FAIL - [Document interface: attribute onloadstart] expected: FAIL @@ -162,18 +144,6 @@ [Document interface: attribute onmousewheel] expected: FAIL - [Document interface: attribute onpause] - expected: FAIL - - [Document interface: attribute onplay] - expected: FAIL - - [Document interface: attribute onplaying] - expected: FAIL - - [Document interface: attribute onprogress] - expected: FAIL - [Document interface: attribute onratechange] expected: FAIL @@ -198,18 +168,9 @@ [Document interface: attribute onstalled] expected: FAIL - [Document interface: attribute onsuspend] - expected: FAIL - - [Document interface: attribute ontimeupdate] - expected: FAIL - [Document interface: attribute onvolumechange] expected: FAIL - [Document interface: attribute onwaiting] - expected: FAIL - [Stringification of iframe.contentDocument] expected: FAIL @@ -1593,9 +1554,6 @@ [HTMLElement interface: attribute commandChecked] expected: FAIL - [HTMLElement interface: attribute onabort] - expected: FAIL - [HTMLElement interface: attribute onautocomplete] expected: FAIL @@ -1605,12 +1563,6 @@ [HTMLElement interface: attribute oncancel] expected: FAIL - [HTMLElement interface: attribute oncanplay] - expected: FAIL - - [HTMLElement interface: attribute oncanplaythrough] - expected: FAIL - [HTMLElement interface: attribute onclose] expected: FAIL @@ -1647,9 +1599,6 @@ [HTMLElement interface: attribute ondurationchange] expected: FAIL - [HTMLElement interface: attribute onemptied] - expected: FAIL - [HTMLElement interface: attribute onended] expected: FAIL @@ -1659,12 +1608,6 @@ [HTMLElement interface: attribute oninvalid] expected: FAIL - [HTMLElement interface: attribute onloadeddata] - expected: FAIL - - [HTMLElement interface: attribute onloadedmetadata] - expected: FAIL - [HTMLElement interface: attribute onloadstart] expected: FAIL @@ -1689,18 +1632,6 @@ [HTMLElement interface: attribute onmousewheel] expected: FAIL - [HTMLElement interface: attribute onpause] - expected: FAIL - - [HTMLElement interface: attribute onplay] - expected: FAIL - - [HTMLElement interface: attribute onplaying] - expected: FAIL - - [HTMLElement interface: attribute onprogress] - expected: FAIL - [HTMLElement interface: attribute onratechange] expected: FAIL @@ -1725,18 +1656,9 @@ [HTMLElement interface: attribute onstalled] expected: FAIL - [HTMLElement interface: attribute onsuspend] - expected: FAIL - - [HTMLElement interface: attribute ontimeupdate] - expected: FAIL - [HTMLElement interface: attribute onvolumechange] expected: FAIL - [HTMLElement interface: attribute onwaiting] - expected: FAIL - [HTMLElement interface: document.createElement("noscript") must inherit property "translate" with the proper type (2)] expected: FAIL @@ -1812,9 +1734,6 @@ [HTMLElement interface: document.createElement("noscript") must inherit property "commandChecked" with the proper type (31)] expected: FAIL - [HTMLElement interface: document.createElement("noscript") must inherit property "onabort" with the proper type (32)] - expected: FAIL - [HTMLElement interface: document.createElement("noscript") must inherit property "onautocomplete" with the proper type (33)] expected: FAIL @@ -1824,12 +1743,6 @@ [HTMLElement interface: document.createElement("noscript") must inherit property "oncancel" with the proper type (36)] expected: FAIL - [HTMLElement interface: document.createElement("noscript") must inherit property "oncanplay" with the proper type (37)] - expected: FAIL - - [HTMLElement interface: document.createElement("noscript") must inherit property "oncanplaythrough" with the proper type (38)] - expected: FAIL - [HTMLElement interface: document.createElement("noscript") must inherit property "onclose" with the proper type (41)] expected: FAIL @@ -1866,9 +1779,6 @@ [HTMLElement interface: document.createElement("noscript") must inherit property "ondurationchange" with the proper type (53)] expected: FAIL - [HTMLElement interface: document.createElement("noscript") must inherit property "onemptied" with the proper type (54)] - expected: FAIL - [HTMLElement interface: document.createElement("noscript") must inherit property "onended" with the proper type (55)] expected: FAIL @@ -1878,12 +1788,6 @@ [HTMLElement interface: document.createElement("noscript") must inherit property "oninvalid" with the proper type (59)] expected: FAIL - [HTMLElement interface: document.createElement("noscript") must inherit property "onloadeddata" with the proper type (64)] - expected: FAIL - - [HTMLElement interface: document.createElement("noscript") must inherit property "onloadedmetadata" with the proper type (65)] - expected: FAIL - [HTMLElement interface: document.createElement("noscript") must inherit property "onloadstart" with the proper type (66)] expected: FAIL @@ -1908,18 +1812,6 @@ [HTMLElement interface: document.createElement("noscript") must inherit property "onmousewheel" with the proper type (74)] expected: FAIL - [HTMLElement interface: document.createElement("noscript") must inherit property "onpause" with the proper type (75)] - expected: FAIL - - [HTMLElement interface: document.createElement("noscript") must inherit property "onplay" with the proper type (76)] - expected: FAIL - - [HTMLElement interface: document.createElement("noscript") must inherit property "onplaying" with the proper type (77)] - expected: FAIL - - [HTMLElement interface: document.createElement("noscript") must inherit property "onprogress" with the proper type (78)] - expected: FAIL - [HTMLElement interface: document.createElement("noscript") must inherit property "onratechange" with the proper type (79)] expected: FAIL @@ -1944,18 +1836,9 @@ [HTMLElement interface: document.createElement("noscript") must inherit property "onstalled" with the proper type (88)] expected: FAIL - [HTMLElement interface: document.createElement("noscript") must inherit property "onsuspend" with the proper type (90)] - expected: FAIL - - [HTMLElement interface: document.createElement("noscript") must inherit property "ontimeupdate" with the proper type (91)] - expected: FAIL - [HTMLElement interface: document.createElement("noscript") must inherit property "onvolumechange" with the proper type (93)] expected: FAIL - [HTMLElement interface: document.createElement("noscript") must inherit property "onwaiting" with the proper type (94)] - expected: FAIL - [Element interface: document.createElement("noscript") must inherit property "query" with the proper type (34)] expected: FAIL @@ -7905,9 +7788,6 @@ [Document interface: document.implementation.createDocument(null, "", null) must inherit property "queryAll" with the proper type (91)] expected: FAIL - [Document interface: document.implementation.createDocument(null, "", null) must inherit property "onabort" with the proper type (94)] - expected: FAIL - [Document interface: document.implementation.createDocument(null, "", null) must inherit property "onautocomplete" with the proper type (95)] expected: FAIL @@ -7917,12 +7797,6 @@ [Document interface: document.implementation.createDocument(null, "", null) must inherit property "oncancel" with the proper type (98)] expected: FAIL - [Document interface: document.implementation.createDocument(null, "", null) must inherit property "oncanplay" with the proper type (99)] - expected: FAIL - - [Document interface: document.implementation.createDocument(null, "", null) must inherit property "oncanplaythrough" with the proper type (100)] - expected: FAIL - [Document interface: document.implementation.createDocument(null, "", null) must inherit property "onclose" with the proper type (103)] expected: FAIL @@ -7959,9 +7833,6 @@ [Document interface: document.implementation.createDocument(null, "", null) must inherit property "ondurationchange" with the proper type (115)] expected: FAIL - [Document interface: document.implementation.createDocument(null, "", null) must inherit property "onemptied" with the proper type (116)] - expected: FAIL - [Document interface: document.implementation.createDocument(null, "", null) must inherit property "onended" with the proper type (117)] expected: FAIL @@ -7971,12 +7842,6 @@ [Document interface: document.implementation.createDocument(null, "", null) must inherit property "oninvalid" with the proper type (121)] expected: FAIL - [Document interface: document.implementation.createDocument(null, "", null) must inherit property "onloadeddata" with the proper type (126)] - expected: FAIL - - [Document interface: document.implementation.createDocument(null, "", null) must inherit property "onloadedmetadata" with the proper type (127)] - expected: FAIL - [Document interface: document.implementation.createDocument(null, "", null) must inherit property "onloadstart" with the proper type (128)] expected: FAIL @@ -8001,18 +7866,6 @@ [Document interface: document.implementation.createDocument(null, "", null) must inherit property "onmousewheel" with the proper type (136)] expected: FAIL - [Document interface: document.implementation.createDocument(null, "", null) must inherit property "onpause" with the proper type (137)] - expected: FAIL - - [Document interface: document.implementation.createDocument(null, "", null) must inherit property "onplay" with the proper type (138)] - expected: FAIL - - [Document interface: document.implementation.createDocument(null, "", null) must inherit property "onplaying" with the proper type (139)] - expected: FAIL - - [Document interface: document.implementation.createDocument(null, "", null) must inherit property "onprogress" with the proper type (140)] - expected: FAIL - [Document interface: document.implementation.createDocument(null, "", null) must inherit property "onratechange" with the proper type (141)] expected: FAIL @@ -8037,18 +7890,9 @@ [Document interface: document.implementation.createDocument(null, "", null) must inherit property "onstalled" with the proper type (150)] expected: FAIL - [Document interface: document.implementation.createDocument(null, "", null) must inherit property "onsuspend" with the proper type (152)] - expected: FAIL - - [Document interface: document.implementation.createDocument(null, "", null) must inherit property "ontimeupdate" with the proper type (153)] - expected: FAIL - [Document interface: document.implementation.createDocument(null, "", null) must inherit property "onvolumechange" with the proper type (155)] expected: FAIL - [Document interface: document.implementation.createDocument(null, "", null) must inherit property "onwaiting" with the proper type (156)] - expected: FAIL - [HTMLAnchorElement interface: attribute origin] expected: FAIL @@ -8451,9 +8295,6 @@ [Document interface: calling queryAll(DOMString) on new Document() with too few arguments must throw TypeError] expected: FAIL - [Document interface: new Document() must inherit property "onabort" with the proper type (94)] - expected: FAIL - [Document interface: new Document() must inherit property "onautocomplete" with the proper type (95)] expected: FAIL @@ -8463,12 +8304,6 @@ [Document interface: new Document() must inherit property "oncancel" with the proper type (98)] expected: FAIL - [Document interface: new Document() must inherit property "oncanplay" with the proper type (99)] - expected: FAIL - - [Document interface: new Document() must inherit property "oncanplaythrough" with the proper type (100)] - expected: FAIL - [Document interface: new Document() must inherit property "onclose" with the proper type (103)] expected: FAIL @@ -8505,9 +8340,6 @@ [Document interface: new Document() must inherit property "ondurationchange" with the proper type (115)] expected: FAIL - [Document interface: new Document() must inherit property "onemptied" with the proper type (116)] - expected: FAIL - [Document interface: new Document() must inherit property "onended" with the proper type (117)] expected: FAIL @@ -8517,12 +8349,6 @@ [Document interface: new Document() must inherit property "oninvalid" with the proper type (121)] expected: FAIL - [Document interface: new Document() must inherit property "onloadeddata" with the proper type (126)] - expected: FAIL - - [Document interface: new Document() must inherit property "onloadedmetadata" with the proper type (127)] - expected: FAIL - [Document interface: new Document() must inherit property "onloadstart" with the proper type (128)] expected: FAIL @@ -8547,18 +8373,6 @@ [Document interface: new Document() must inherit property "onmousewheel" with the proper type (136)] expected: FAIL - [Document interface: new Document() must inherit property "onpause" with the proper type (137)] - expected: FAIL - - [Document interface: new Document() must inherit property "onplay" with the proper type (138)] - expected: FAIL - - [Document interface: new Document() must inherit property "onplaying" with the proper type (139)] - expected: FAIL - - [Document interface: new Document() must inherit property "onprogress" with the proper type (140)] - expected: FAIL - [Document interface: new Document() must inherit property "onratechange" with the proper type (141)] expected: FAIL @@ -8583,15 +8397,6 @@ [Document interface: new Document() must inherit property "onstalled" with the proper type (150)] expected: FAIL - [Document interface: new Document() must inherit property "onsuspend" with the proper type (152)] - expected: FAIL - - [Document interface: new Document() must inherit property "ontimeupdate" with the proper type (153)] - expected: FAIL - [Document interface: new Document() must inherit property "onvolumechange" with the proper type (155)] expected: FAIL - [Document interface: new Document() must inherit property "onwaiting" with the proper type (156)] - expected: FAIL - diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/error-codes/error.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/error-codes/error.html.ini index 4073dc3708e..92d9425aabf 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/error-codes/error.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/error-codes/error.html.ini @@ -1,15 +1,9 @@ [error.html] type: testharness expected: TIMEOUT - [audio.error after successful load] - expected: TIMEOUT - [audio.error after setting src to the empty string] expected: TIMEOUT - [video.error after successful load] - expected: TIMEOUT - [video.error after setting src to the empty string] expected: TIMEOUT diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-to-other-document.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-to-other-document.html.ini index 7b90f687874..020a3ceebaa 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-to-other-document.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-to-other-document.html.ini @@ -1,6 +1,5 @@ [pause-move-to-other-document.html] type: testharness - expected: TIMEOUT [paused state when moving to other document] - expected: TIMEOUT + expected: FAIL diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-within-document.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-within-document.html.ini deleted file mode 100644 index 11d7f005539..00000000000 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-within-document.html.ini +++ /dev/null @@ -1,6 +0,0 @@ -[pause-move-within-document.html] - type: testharness - expected: TIMEOUT - [paused state when moving within a document] - expected: TIMEOUT - diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document-networkState.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document-networkState.html.ini deleted file mode 100644 index 806dc781bee..00000000000 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document-networkState.html.ini +++ /dev/null @@ -1,6 +0,0 @@ -[pause-remove-from-document-networkState.html] - type: testharness - expected: TIMEOUT - [paused state when removing from a document when networkState is NETWORK_EMPTY] - expected: TIMEOUT - diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document.html.ini index 51811a2a184..fd8fc8860ab 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document.html.ini @@ -1,6 +1,5 @@ [pause-remove-from-document.html] type: testharness - expected: TIMEOUT [paused state when removing from a document] - expected: TIMEOUT + expected: FAIL From c64d7578d170b589f624b96d2acab614ba73baf6 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Mon, 4 Jan 2016 15:48:41 -0500 Subject: [PATCH 09/13] Disable two tests that take a very long time to time out. --- .../embedded-content/media-elements/audio_loop_base.html.ini | 1 + .../embedded-content/media-elements/video_loop_base.html.ini | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/audio_loop_base.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/audio_loop_base.html.ini index 91202ffc556..bd674d3bc79 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/audio_loop_base.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/audio_loop_base.html.ini @@ -1,6 +1,7 @@ [audio_loop_base.html] type: testharness expected: TIMEOUT + disabled: extreme timeout [Check if audio.loop is set to true that expecting the seeking event is fired more than once] expected: NOTRUN diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/video_loop_base.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/video_loop_base.html.ini index 85f679af410..54aec4c29aa 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/video_loop_base.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/video_loop_base.html.ini @@ -1,6 +1,7 @@ [video_loop_base.html] type: testharness expected: TIMEOUT + disabled: extreme timeout [Check if video.loop is set to true that expecting the seeking event is fired more than once] expected: NOTRUN From ef10393ba6262ca6408581da800462c80955c6cc Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Sat, 7 Nov 2015 18:05:18 -0500 Subject: [PATCH 10/13] Execute the failure steps for an empty src attribute. --- components/script/dom/htmlmediaelement.rs | 2 +- .../media-elements/error-codes/error.html.ini | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/error-codes/error.html.ini diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index 928c0ed6e93..951f6e47b70 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -357,7 +357,7 @@ impl HTMLMediaElement { ResourceSelectionMode::Attribute(src) => { // Step 1 if src.is_empty() { - // TODO failed with attribute + self.queue_dedicated_media_source_failure_steps(); return; } diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/error-codes/error.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/error-codes/error.html.ini deleted file mode 100644 index 92d9425aabf..00000000000 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/error-codes/error.html.ini +++ /dev/null @@ -1,9 +0,0 @@ -[error.html] - type: testharness - expected: TIMEOUT - [audio.error after setting src to the empty string] - expected: TIMEOUT - - [video.error after setting src to the empty string] - expected: TIMEOUT - From f78d88acbe6693235380bea49f2f4fad16433fd3 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Sun, 8 Nov 2015 09:25:59 -0500 Subject: [PATCH 11/13] Implement partial spec-recommended preload=none support. --- components/script/dom/htmlmediaelement.rs | 20 +- .../dom/webidls/HTMLMediaElement.webidl | 2 +- .../wpt/metadata/html/dom/interfaces.html.ini | 9 - .../html/dom/reflection-embedded.html.ini | 228 ------------------ .../preload_reflects_none_autoplay.html.ini | 8 - 5 files changed, 20 insertions(+), 247 deletions(-) delete mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/preload_reflects_none_autoplay.html.ini diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index 951f6e47b70..fcb192cd250 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -387,7 +387,19 @@ impl HTMLMediaElement { // Step 4 if let Resource::Url(url) = resource { - // TODO 4.1 (preload=none) + // 4.1 + if self.Preload() == "none" && !self.autoplaying.get(){ + // 4.1.1 + self.network_state.set(NETWORK_IDLE); + + // 4.1.2 + self.queue_fire_simple_event("suspend"); + + // TODO 4.1.3 (delay load flag) + + // TODO 4.1.5-7 (state for load that initiates later) + return; + } // 4.2 let context = Arc::new(Mutex::new(HTMLMediaElementContext::new(self, url.clone()))); @@ -509,6 +521,12 @@ impl HTMLMediaElementMethods for HTMLMediaElement { // https://html.spec.whatwg.org/multipage/#dom-media-src make_setter!(SetSrc, "src"); + // https://html.spec.whatwg.org/multipage/#attr-media-preload + // Missing value default is user-agent defined. + make_enumerated_getter!(Preload, "preload", "", ("none") | ("metadata") | ("auto")); + // https://html.spec.whatwg.org/multipage/#attr-media-preload + make_setter!(SetPreload, "preload"); + // https://html.spec.whatwg.org/multipage/#dom-media-currentsrc fn CurrentSrc(&self) -> DOMString { DOMString::from(self.current_src.borrow().clone()) diff --git a/components/script/dom/webidls/HTMLMediaElement.webidl b/components/script/dom/webidls/HTMLMediaElement.webidl index ba81478be46..ce952c9b539 100644 --- a/components/script/dom/webidls/HTMLMediaElement.webidl +++ b/components/script/dom/webidls/HTMLMediaElement.webidl @@ -19,7 +19,7 @@ interface HTMLMediaElement : HTMLElement { const unsigned short NETWORK_LOADING = 2; const unsigned short NETWORK_NO_SOURCE = 3; readonly attribute unsigned short networkState; - // attribute DOMString preload; + attribute DOMString preload; //readonly attribute TimeRanges buffered; void load(); CanPlayTypeResult canPlayType(DOMString type); diff --git a/tests/wpt/metadata/html/dom/interfaces.html.ini b/tests/wpt/metadata/html/dom/interfaces.html.ini index 78f775ca587..49996d27548 100644 --- a/tests/wpt/metadata/html/dom/interfaces.html.ini +++ b/tests/wpt/metadata/html/dom/interfaces.html.ini @@ -2505,9 +2505,6 @@ [HTMLMediaElement interface: document.createElement("video") must inherit property "crossOrigin" with the proper type (3)] expected: FAIL - [HTMLMediaElement interface: document.createElement("video") must inherit property "preload" with the proper type (9)] - expected: FAIL - [HTMLMediaElement interface: document.createElement("video") must inherit property "buffered" with the proper type (10)] expected: FAIL @@ -2583,9 +2580,6 @@ [HTMLMediaElement interface: document.createElement("audio") must inherit property "crossOrigin" with the proper type (3)] expected: FAIL - [HTMLMediaElement interface: document.createElement("audio") must inherit property "preload" with the proper type (9)] - expected: FAIL - [HTMLMediaElement interface: document.createElement("audio") must inherit property "buffered" with the proper type (10)] expected: FAIL @@ -2916,9 +2910,6 @@ [HTMLMediaElement interface: attribute crossOrigin] expected: FAIL - [HTMLMediaElement interface: attribute preload] - expected: FAIL - [HTMLMediaElement interface: attribute buffered] 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 adb86b793cb..b642ef919b3 100644 --- a/tests/wpt/metadata/html/dom/reflection-embedded.html.ini +++ b/tests/wpt/metadata/html/dom/reflection-embedded.html.ini @@ -9645,120 +9645,6 @@ [video.crossOrigin: IDL set to "USE-CREDENTIALS" followed by IDL get] expected: FAIL - [video.preload: typeof IDL attribute] - expected: FAIL - - [video.preload: setAttribute() to "none" followed by IDL get] - expected: FAIL - - [video.preload: setAttribute() to "NONE" followed by IDL get] - expected: FAIL - - [video.preload: setAttribute() to "metadata" followed by IDL get] - expected: FAIL - - [video.preload: setAttribute() to "METADATA" followed by IDL get] - expected: FAIL - - [video.preload: setAttribute() to "auto" followed by IDL get] - expected: FAIL - - [video.preload: setAttribute() to "AUTO" followed by IDL get] - expected: FAIL - - [video.preload: IDL set to "" followed by getAttribute()] - expected: FAIL - - [video.preload: 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 foo " followed by getAttribute()] - expected: FAIL - - [video.preload: IDL set to undefined followed by getAttribute()] - expected: FAIL - - [video.preload: IDL set to 7 followed by getAttribute()] - expected: FAIL - - [video.preload: IDL set to 1.5 followed by getAttribute()] - expected: FAIL - - [video.preload: IDL set to true followed by getAttribute()] - expected: FAIL - - [video.preload: IDL set to false followed by getAttribute()] - expected: FAIL - - [video.preload: IDL set to object "[object Object\]" followed by getAttribute()] - expected: FAIL - - [video.preload: IDL set to NaN followed by getAttribute()] - expected: FAIL - - [video.preload: IDL set to Infinity followed by getAttribute()] - expected: FAIL - - [video.preload: IDL set to -Infinity followed by getAttribute()] - expected: FAIL - - [video.preload: IDL set to "\\0" followed by getAttribute()] - expected: FAIL - - [video.preload: IDL set to object "test-toString" followed by getAttribute()] - expected: FAIL - - [video.preload: IDL set to object "test-valueOf" followed by getAttribute()] - expected: FAIL - - [video.preload: IDL set to "none" followed by getAttribute()] - expected: FAIL - - [video.preload: IDL set to "xnone" followed by getAttribute()] - expected: FAIL - - [video.preload: IDL set to "none\\0" followed by getAttribute()] - expected: FAIL - - [video.preload: IDL set to "one" followed by getAttribute()] - expected: FAIL - - [video.preload: IDL set to "NONE" followed by getAttribute()] - expected: FAIL - - [video.preload: IDL set to "NONE" followed by IDL get] - expected: FAIL - - [video.preload: IDL set to "metadata" followed by getAttribute()] - expected: FAIL - - [video.preload: IDL set to "xmetadata" followed by getAttribute()] - expected: FAIL - - [video.preload: IDL set to "metadata\\0" followed by getAttribute()] - expected: FAIL - - [video.preload: IDL set to "etadata" followed by getAttribute()] - expected: FAIL - - [video.preload: IDL set to "METADATA" followed by getAttribute()] - expected: FAIL - - [video.preload: IDL set to "METADATA" followed by IDL get] - expected: FAIL - - [video.preload: IDL set to "auto" followed by getAttribute()] - expected: FAIL - - [video.preload: IDL set to "xauto" followed by getAttribute()] - expected: FAIL - - [video.preload: IDL set to "auto\\0" followed by getAttribute()] - expected: FAIL - - [video.preload: IDL set to "uto" followed by getAttribute()] - expected: FAIL - - [video.preload: IDL set to "AUTO" followed by IDL get] - expected: FAIL - [video.loop: typeof IDL attribute] expected: FAIL @@ -11685,120 +11571,6 @@ [audio.crossOrigin: IDL set to "USE-CREDENTIALS" followed by IDL get] expected: FAIL - [audio.preload: typeof IDL attribute] - expected: FAIL - - [audio.preload: setAttribute() to "none" followed by IDL get] - expected: FAIL - - [audio.preload: setAttribute() to "NONE" followed by IDL get] - expected: FAIL - - [audio.preload: setAttribute() to "metadata" followed by IDL get] - expected: FAIL - - [audio.preload: setAttribute() to "METADATA" followed by IDL get] - expected: FAIL - - [audio.preload: setAttribute() to "auto" followed by IDL get] - expected: FAIL - - [audio.preload: setAttribute() to "AUTO" followed by IDL get] - expected: FAIL - - [audio.preload: IDL set to "" followed by getAttribute()] - expected: FAIL - - [audio.preload: 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 foo " followed by getAttribute()] - expected: FAIL - - [audio.preload: IDL set to undefined followed by getAttribute()] - expected: FAIL - - [audio.preload: IDL set to 7 followed by getAttribute()] - expected: FAIL - - [audio.preload: IDL set to 1.5 followed by getAttribute()] - expected: FAIL - - [audio.preload: IDL set to true followed by getAttribute()] - expected: FAIL - - [audio.preload: IDL set to false followed by getAttribute()] - expected: FAIL - - [audio.preload: IDL set to object "[object Object\]" followed by getAttribute()] - expected: FAIL - - [audio.preload: IDL set to NaN followed by getAttribute()] - expected: FAIL - - [audio.preload: IDL set to Infinity followed by getAttribute()] - expected: FAIL - - [audio.preload: IDL set to -Infinity followed by getAttribute()] - expected: FAIL - - [audio.preload: IDL set to "\\0" followed by getAttribute()] - expected: FAIL - - [audio.preload: IDL set to object "test-toString" followed by getAttribute()] - expected: FAIL - - [audio.preload: IDL set to object "test-valueOf" followed by getAttribute()] - expected: FAIL - - [audio.preload: IDL set to "none" followed by getAttribute()] - expected: FAIL - - [audio.preload: IDL set to "xnone" followed by getAttribute()] - expected: FAIL - - [audio.preload: IDL set to "none\\0" followed by getAttribute()] - expected: FAIL - - [audio.preload: IDL set to "one" followed by getAttribute()] - expected: FAIL - - [audio.preload: IDL set to "NONE" followed by getAttribute()] - expected: FAIL - - [audio.preload: IDL set to "NONE" followed by IDL get] - expected: FAIL - - [audio.preload: IDL set to "metadata" followed by getAttribute()] - expected: FAIL - - [audio.preload: IDL set to "xmetadata" followed by getAttribute()] - expected: FAIL - - [audio.preload: IDL set to "metadata\\0" followed by getAttribute()] - expected: FAIL - - [audio.preload: IDL set to "etadata" followed by getAttribute()] - expected: FAIL - - [audio.preload: IDL set to "METADATA" followed by getAttribute()] - expected: FAIL - - [audio.preload: IDL set to "METADATA" followed by IDL get] - expected: FAIL - - [audio.preload: IDL set to "auto" followed by getAttribute()] - expected: FAIL - - [audio.preload: IDL set to "xauto" followed by getAttribute()] - expected: FAIL - - [audio.preload: IDL set to "auto\\0" followed by getAttribute()] - expected: FAIL - - [audio.preload: IDL set to "uto" followed by getAttribute()] - expected: FAIL - - [audio.preload: IDL set to "AUTO" followed by IDL get] - expected: FAIL - [audio.loop: typeof IDL attribute] expected: FAIL diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/preload_reflects_none_autoplay.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/preload_reflects_none_autoplay.html.ini deleted file mode 100644 index 320b6d2199e..00000000000 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/preload_reflects_none_autoplay.html.ini +++ /dev/null @@ -1,8 +0,0 @@ -[preload_reflects_none_autoplay.html] - type: testharness - [audio.preload - reflection test] - expected: FAIL - - [video.preload - reflection test] - expected: FAIL - From 99f6fb34fc4873af0d084aa9b97173770d5ebe11 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Mon, 4 Jan 2016 16:08:37 -0500 Subject: [PATCH 12/13] Tidy fixes. --- components/script/dom/htmlmediaelement.rs | 6 ++++-- components/script/dom/mediaerror.rs | 1 + components/script/dom/webidls/MediaError.webidl | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index fcb192cd250..3d7fd6fa850 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -7,8 +7,8 @@ use dom::attr::Attr; use dom::bindings::cell::DOMRefCell; use dom::bindings::codegen::Bindings::AttrBinding::AttrMethods; use dom::bindings::codegen::Bindings::HTMLMediaElementBinding::CanPlayTypeResult; -use dom::bindings::codegen::Bindings::HTMLMediaElementBinding::HTMLMediaElementMethods; use dom::bindings::codegen::Bindings::HTMLMediaElementBinding::HTMLMediaElementConstants::*; +use dom::bindings::codegen::Bindings::HTMLMediaElementBinding::HTMLMediaElementMethods; use dom::bindings::codegen::Bindings::MediaErrorBinding::MediaErrorConstants::*; use dom::bindings::global::GlobalRef; use dom::bindings::inheritance::Castable; @@ -388,7 +388,7 @@ impl HTMLMediaElement { // Step 4 if let Resource::Url(url) = resource { // 4.1 - if self.Preload() == "none" && !self.autoplaying.get(){ + if self.Preload() == "none" && !self.autoplaying.get() { // 4.1.1 self.network_state.set(NETWORK_IDLE); @@ -503,10 +503,12 @@ impl HTMLMediaElement { } impl HTMLMediaElementMethods for HTMLMediaElement { + // https://html.spec.whatwg.org/multipage/#dom-media-networkstate fn NetworkState(&self) -> u16 { self.network_state.get() } + // https://html.spec.whatwg.org/multipage/#dom-media-readystate fn ReadyState(&self) -> u16 { self.ready_state.get() } diff --git a/components/script/dom/mediaerror.rs b/components/script/dom/mediaerror.rs index 4d36ab4ec69..17d92947f72 100644 --- a/components/script/dom/mediaerror.rs +++ b/components/script/dom/mediaerror.rs @@ -30,6 +30,7 @@ impl MediaError { } impl MediaErrorMethods for MediaError { + // https://html.spec.whatwg.org/multipage/#dom-mediaerror-code fn Code(&self) -> u16 { self.code } diff --git a/components/script/dom/webidls/MediaError.webidl b/components/script/dom/webidls/MediaError.webidl index 52210aa8c01..7bebcb655cc 100644 --- a/components/script/dom/webidls/MediaError.webidl +++ b/components/script/dom/webidls/MediaError.webidl @@ -3,7 +3,7 @@ * 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/. */ -// https://html.spec.whatwg.org/multipage/embedded-content.html#mediaerror +// https://html.spec.whatwg.org/multipage/#mediaerror interface MediaError { const unsigned short MEDIA_ERR_ABORTED = 1; From f16c05423c75fc166db9790d91ac06d7a105ca03 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Wed, 27 Apr 2016 20:16:24 -0400 Subject: [PATCH 13/13] Add more specification step comments and update to the latest specification. --- components/script/dom/htmlmediaelement.rs | 182 +++++++++++++----- .../script/dom/webidls/MediaError.webidl | 1 - 2 files changed, 136 insertions(+), 47 deletions(-) diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index 3d7fd6fa850..25e1c9bbb66 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -10,6 +10,7 @@ use dom::bindings::codegen::Bindings::HTMLMediaElementBinding::CanPlayTypeResult use dom::bindings::codegen::Bindings::HTMLMediaElementBinding::HTMLMediaElementConstants::*; use dom::bindings::codegen::Bindings::HTMLMediaElementBinding::HTMLMediaElementMethods; use dom::bindings::codegen::Bindings::MediaErrorBinding::MediaErrorConstants::*; +use dom::bindings::codegen::Bindings::MediaErrorBinding::MediaErrorMethods; use dom::bindings::global::GlobalRef; use dom::bindings::inheritance::Castable; use dom::bindings::js::{Root, MutNullableHeap, JS}; @@ -31,8 +32,8 @@ use script_thread::{Runnable, ScriptThread}; use std::cell::Cell; use std::sync::{Arc, Mutex}; use string_cache::Atom; -use task_source::dom_manipulation::DOMManipulationTask; use task_source::TaskSource; +use task_source::dom_manipulation::DOMManipulationTask; use time::{self, Timespec, Duration}; use url::Url; use util::str::DOMString; @@ -56,7 +57,6 @@ struct HTMLMediaElementContext { ignore_response: bool, } -// https://html.spec.whatwg.org/multipage/#media-data-processing-steps-list impl AsyncResponseListener for HTMLMediaElementContext { // https://html.spec.whatwg.org/multipage/#media-data-processing-steps-list fn headers_available(&mut self, metadata: Result) { @@ -87,14 +87,20 @@ impl AsyncResponseListener for HTMLMediaElementContext { let elem = self.elem.root(); + // https://html.spec.whatwg.org/multipage/#media-data-processing-steps-list + // => "Once enough of the media data has been fetched to determine the duration..." if !self.have_metadata { //TODO: actually check if the payload contains the full metadata + + // Step 6 elem.change_ready_state(HAVE_METADATA); self.have_metadata = true; } else { elem.change_ready_state(HAVE_CURRENT_DATA); } + // https://html.spec.whatwg.org/multipage/#concept-media-load-resource step 4, + // => "If mode is remote" step 2 if time::get_time() > self.next_progress_event { elem.queue_fire_simple_event("progress"); self.next_progress_event = time::get_time() + Duration::milliseconds(350); @@ -105,6 +111,7 @@ impl AsyncResponseListener for HTMLMediaElementContext { fn response_complete(&mut self, status: Result<(), NetworkError>) { let elem = self.elem.root(); + // => "Once the entire media resource has been fetched..." if status.is_ok() { elem.change_ready_state(HAVE_ENOUGH_DATA); @@ -113,16 +120,23 @@ impl AsyncResponseListener for HTMLMediaElementContext { elem.network_state.set(NETWORK_IDLE); elem.fire_simple_event("suspend"); - } else if elem.ready_state.get() != HAVE_NOTHING { + } + // => "If the connection is interrupted after some media data has been received..." + else if elem.ready_state.get() != HAVE_NOTHING { + // Step 2 elem.error.set(Some(&*MediaError::new(&*window_from_node(&*elem), MEDIA_ERR_NETWORK))); + // Step 3 elem.network_state.set(NETWORK_IDLE); - // TODO: update delay load flag + // TODO: Step 4 - update delay load flag + // Step 5 elem.fire_simple_event("error"); - } else { + } + // => "If the media data cannot be fetched at all..." + else { elem.queue_dedicated_media_source_failure_steps(); } @@ -189,7 +203,7 @@ impl HTMLMediaElement { &self.htmlelement } - // https://html.spec.whatwg.org/multipage/#playing-the-media-resource:internal-pause-steps + // https://html.spec.whatwg.org/multipage/#internal-pause-steps fn internal_pause_steps(&self) { // Step 1 self.autoplaying.set(false); @@ -200,17 +214,63 @@ impl HTMLMediaElement { self.paused.set(true); // 2.2 - self.queue_fire_simple_event("timeupdate"); + self.queue_internal_pause_steps_task(); - // 2.3 - self.queue_fire_simple_event("pause"); - - // TODO 2.4 (official playback position) + // TODO 2.3 (official playback position) } // TODO step 3 (media controller) } + // https://html.spec.whatwg.org/multipage/#notify-about-playing + fn notify_about_playing(&self) { + // Step 1 + self.fire_simple_event("playing"); + // TODO Step 2 + } + + fn queue_notify_about_playing(&self) { + struct Task { + elem: Trusted, + } + + impl Runnable for Task { + fn handler(self: Box) { + self.elem.root().notify_about_playing(); + } + } + + let task = Task { + elem: Trusted::new(self), + }; + let win = window_from_node(self); + let _ = win.dom_manipulation_task_source().queue(DOMManipulationTask::MediaTask(box task)); + } + + // https://html.spec.whatwg.org/multipage/#internal-pause-steps step 2.2 + fn queue_internal_pause_steps_task(&self) { + struct Task { + elem: Trusted, + } + + impl Runnable for Task { + fn handler(self: Box) { + let elem = self.elem.root(); + // 2.2.1 + elem.fire_simple_event("timeupdate"); + // 2.2.2 + elem.fire_simple_event("pause"); + // TODO 2.2.3 + } + } + + let task = Task { + elem: Trusted::new(self), + }; + let win = window_from_node(self); + let _ = win.dom_manipulation_task_source().queue(DOMManipulationTask::MediaTask(box task)); + } + fn queue_fire_simple_event(&self, type_: &'static str) { let win = window_from_node(self); let task = FireSimpleEventTask::new(self, type_); @@ -235,6 +295,7 @@ impl HTMLMediaElement { return; } + // Step 1 match (old_ready_state, ready_state) { // previous ready state was HAVE_NOTHING, and the new ready state is // HAVE_METADATA @@ -267,6 +328,7 @@ impl HTMLMediaElement { _ => (), } + // Step 1 // If the new ready state is HAVE_FUTURE_DATA or HAVE_ENOUGH_DATA, // then the relevant steps below must then be run also. match (old_ready_state, ready_state) { @@ -277,8 +339,9 @@ impl HTMLMediaElement { (HAVE_NOTHING, HAVE_FUTURE_DATA) => { self.queue_fire_simple_event("canplay"); - // TODO: check paused state - self.queue_fire_simple_event("playing"); + if !self.Paused() { + self.queue_notify_about_playing(); + } } // new ready state is HAVE_ENOUGH_DATA @@ -287,17 +350,23 @@ impl HTMLMediaElement { self.queue_fire_simple_event("canplay"); if !self.Paused() { - self.queue_fire_simple_event("playing"); + self.queue_notify_about_playing(); } } + //TODO: check sandboxed automatic features browsing context flag if self.autoplaying.get() && self.Paused() && self.Autoplay() { + // Step 1 self.paused.set(false); - // TODO: show poster + // TODO step 2: show poster + // Step 3 self.queue_fire_simple_event("play"); - self.queue_fire_simple_event("playing"); + // Step 4 + self.queue_notify_about_playing(); + // Step 5 + self.autoplaying.set(false); } self.queue_fire_simple_event("canplaythrough"); @@ -305,6 +374,8 @@ impl HTMLMediaElement { _ => (), } + + // TODO Step 2: media controller } // https://html.spec.whatwg.org/multipage/#concept-media-load-algorithm @@ -447,7 +518,8 @@ impl HTMLMediaElement { // Step 5 self.fire_simple_event("error"); - // TODO step 6 (delay load event) + // TODO step 6 (resolve pending play promises) + // TODO step 7 (delay load event) } // https://html.spec.whatwg.org/multipage/#media-element-load-algorithm @@ -458,15 +530,12 @@ impl HTMLMediaElement { // Step 2 self.generation_id.set(self.generation_id.get() + 1); + // TODO reject pending play promises // Step 3 let network_state = self.NetworkState(); - match network_state { - NETWORK_LOADING | - NETWORK_IDLE => { - self.queue_fire_simple_event("abort"); - } - _ => (), + if network_state == NETWORK_LOADING || network_state == NETWORK_IDLE { + self.queue_fire_simple_event("abort"); } // Step 4 @@ -476,18 +545,22 @@ impl HTMLMediaElement { // TODO 4.2 (abort in-progress fetch) - // TODO 4.3 (forget resource tracks) + // TODO 4.3 (detach media provider object) + // TODO 4.4 (forget resource tracks) - // 4.4 - self.change_ready_state(HAVE_NOTHING); + // 4.5 + if self.ready_state.get() != HAVE_NOTHING { + self.change_ready_state(HAVE_NOTHING); + } + // 4.6 if !self.Paused() { self.paused.set(true); } - // TODO 4.6 (seeking) - // TODO 4.7 (playback position) - // TODO 4.8 (timeline offset) - // TODO 4.9 (duration) + // TODO 4.7 (seeking) + // TODO 4.8 (playback position) + // TODO 4.9 (timeline offset) + // TODO 4.10 (duration) } // TODO step 5 (playback rate) @@ -552,40 +625,57 @@ impl HTMLMediaElementMethods for HTMLMediaElement { // https://html.spec.whatwg.org/multipage/#dom-media-play fn Play(&self) { - // Step 1 + // TODO step 1 + + // Step 2 + if self.error.get().map_or(false, |e| e.Code() == MEDIA_ERR_SRC_NOT_SUPPORTED) { + // TODO return rejected promise + return; + } + + // TODO step 3 + + // Step 4 if self.network_state.get() == NETWORK_EMPTY { self.invoke_resource_selection_algorithm(); } - // TODO step 2 (seek backwards) + // TODO step 5 (seek backwards) - // TODO step 3 (media controller) + // TODO step 6 (media controller) - // Step 4 + let state = self.ready_state.get(); + + // Step 7 if self.Paused() { - // 4.1 + // 7.1 self.paused.set(false); - // TODO 4.2 (show poster) + // TODO 7.2 (show poster) - // 4.3 + // 7.3 self.queue_fire_simple_event("play"); - // 4.4 - let state = self.ready_state.get(); + // 7.4 if state == HAVE_NOTHING || state == HAVE_METADATA || state == HAVE_CURRENT_DATA { self.queue_fire_simple_event("waiting"); } else { - self.queue_fire_simple_event("playing"); + self.queue_notify_about_playing(); } - - // 4.5 - self.autoplaying.set(false); - - // TODO 4.6 (media controller) } + // Step 8 + else if state == HAVE_FUTURE_DATA || state == HAVE_ENOUGH_DATA { + // TODO resolve pending play promises + } + + // Step 9 + self.autoplaying.set(false); + + // TODO step 10 (media controller) + + // TODO return promise } // https://html.spec.whatwg.org/multipage/#dom-media-pause @@ -623,7 +713,7 @@ impl VirtualMethods for HTMLMediaElement { }; } - // https://html.spec.whatwg.org/multipage/#playing-the-media-resource:media-element-75 + // https://html.spec.whatwg.org/multipage/#playing-the-media-resource:remove-an-element-from-a-document fn unbind_from_tree(&self, context: &UnbindContext) { self.super_type().unwrap().unbind_from_tree(context); diff --git a/components/script/dom/webidls/MediaError.webidl b/components/script/dom/webidls/MediaError.webidl index 7bebcb655cc..4363ae911ba 100644 --- a/components/script/dom/webidls/MediaError.webidl +++ b/components/script/dom/webidls/MediaError.webidl @@ -1,4 +1,3 @@ -/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* This Source Code Form is subject to the terms of the Mozilla Public * 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/. */