From 11ac049d278cb4eff6866943b81a0a3f4c28f108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Jim=C3=A9nez=20Moreno?= Date: Wed, 3 Oct 2018 20:39:19 +0200 Subject: [PATCH] Make sure we do not skip the HaveMetadata state. Fixes a bunch of tests --- components/script/dom/htmlmediaelement.rs | 5 +++++ .../load-events-networkState.html.ini | 4 ++++ .../resource-selection-invoke-insert-into-iframe.html.ini | 4 ++++ .../resource-selection-invoke-pause-networkState.html.ini | 4 ++++ ...lection-invoke-remove-from-document-networkState.html.ini | 4 ++++ 5 files changed, 21 insertions(+) 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/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-pause-networkState.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 diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index 97d94995f95..84380c8d11f 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -1314,6 +1314,11 @@ impl FetchResponseListener for HTMLMediaElementContext { } if status.is_ok() { + if elem.ready_state.get() == ReadyState::HaveNothing { + // Make sure that we don't skip the HaveMetadata and HaveCurrentData + // states for short streams. + elem.change_ready_state(ReadyState::HaveMetadata); + } elem.change_ready_state(ReadyState::HaveEnoughData); elem.upcast::().fire_event(atom!("progress")); 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..95be7126728 --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-events-networkState.html.ini @@ -0,0 +1,4 @@ +[load-events-networkState.html] + [NETWORK_NO_SOURCE] + 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..dd5f01686e9 --- /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,4 @@ +[resource-selection-invoke-insert-into-iframe.html] + [NOT invoking resource selection by inserting into other document with src set] + 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..80becaced04 --- /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,4 @@ +[resource-selection-invoke-pause-networkState.html] + [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-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..cbd728cd5fd --- /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,4 @@ +[resource-selection-invoke-remove-from-document-networkState.html] + [NOT invoking resource selection with implicit pause() when networkState is not NETWORK_EMPTY] + expected: FAIL +