Skip to content

Commit

Permalink
Implement HTMLMediaElement.crossorigin attribute logic.
Browse files Browse the repository at this point in the history
  • Loading branch information
Jack Britton authored and ferjm committed May 22, 2019
1 parent 415b26e commit a2e0266
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 55 deletions.
20 changes: 18 additions & 2 deletions components/script/dom/htmlmediaelement.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ use crate::dom::bindings::root::{Dom, DomRoot, LayoutDom, MutNullableDom};
use crate::dom::bindings::str::{DOMString, USVString};
use crate::dom::blob::Blob;
use crate::dom::document::Document;
use crate::dom::element::{
cors_setting_for_element, reflect_cross_origin_attribute, set_cross_origin_attribute,
};
use crate::dom::element::{AttributeMutation, Element};
use crate::dom::event::Event;
use crate::dom::eventtarget::EventTarget;
Expand Down Expand Up @@ -64,7 +67,7 @@ use ipc_channel::ipc;
use ipc_channel::router::ROUTER;
use net_traits::image::base::Image;
use net_traits::image_cache::ImageResponse;
use net_traits::request::{CredentialsMode, Destination, Referrer, RequestBuilder};
use net_traits::request::{CredentialsMode, Destination, Referrer, RequestBuilder, RequestMode};
use net_traits::{CoreResourceMsg, FetchChannels, FetchMetadata, FetchResponseListener, Metadata};
use net_traits::{NetworkError, ResourceFetchTiming, ResourceTimingType};
use script_layout_interface::HTMLMediaData;
Expand Down Expand Up @@ -707,7 +710,6 @@ impl HTMLMediaElement {
return;
}

// FIXME(nox): Handle CORS setting from crossorigin attribute.
let document = document_from_node(self);
let destination = match self.media_type_id() {
HTMLMediaElementTypeId::HTMLAudioElement => Destination::Audio,
Expand All @@ -728,6 +730,11 @@ impl HTMLMediaElement {
.headers(headers)
.destination(destination)
.credentials_mode(CredentialsMode::Include)
// https://html.spec.whatwg.org/multipage/urls-and-fetching.html#create-a-potential-cors-request
.mode(match cors_setting_for_element(self.upcast::<Element>()) {
Some(_) => RequestMode::CorsMode,
None => RequestMode::NoCors,
})
.use_url_credentials(true)
.origin(document.origin().immutable().clone())
.pipeline_id(Some(self.global().pipeline_id()))
Expand Down Expand Up @@ -1614,6 +1621,15 @@ impl HTMLMediaElementMethods for HTMLMediaElement {
// https://html.spec.whatwg.org/multipage/#dom-media-src
make_url_setter!(SetSrc, "src");

// https://html.spec.whatwg.org/multipage/#dom-media-crossOrigin
fn GetCrossOrigin(&self) -> Option<DOMString> {
reflect_cross_origin_attribute(self.upcast::<Element>())
}
// https://html.spec.whatwg.org/multipage/#dom-media-crossOrigin
fn SetCrossOrigin(&self, value: Option<DOMString>) {
set_cross_origin_attribute(self.upcast::<Element>(), value);
}

// https://html.spec.whatwg.org/multipage/#dom-media-muted
fn Muted(&self) -> bool {
self.muted.get()
Expand Down
2 changes: 1 addition & 1 deletion components/script/dom/webidls/HTMLMediaElement.webidl
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ interface HTMLMediaElement : HTMLElement {
[CEReactions] attribute USVString src;
attribute MediaProvider? srcObject;
readonly attribute USVString currentSrc;
// [CEReactions] attribute DOMString crossOrigin;
[CEReactions] attribute DOMString? crossOrigin;
const unsigned short NETWORK_EMPTY = 0;
const unsigned short NETWORK_IDLE = 1;
const unsigned short NETWORK_LOADING = 2;
Expand Down
21 changes: 0 additions & 21 deletions tests/wpt/metadata/html/dom/interfaces.https.html.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1016,9 +1016,6 @@
[HTMLMediaElement interface: document.createElement("video") must inherit property "srcObject" with the proper type]
expected: FAIL

[HTMLMediaElement interface: document.createElement("video") must inherit property "crossOrigin" with the proper type]
expected: FAIL

[HTMLMediaElement interface: document.createElement("video") must inherit property "buffered" with the proper type]
expected: FAIL

Expand Down Expand Up @@ -1085,9 +1082,6 @@
[HTMLMediaElement interface: document.createElement("audio") must inherit property "srcObject" with the proper type]
expected: FAIL

[HTMLMediaElement interface: document.createElement("audio") must inherit property "crossOrigin" with the proper type]
expected: FAIL

[HTMLMediaElement interface: document.createElement("audio") must inherit property "buffered" with the proper type]
expected: FAIL

Expand Down Expand Up @@ -1169,9 +1163,6 @@
[HTMLMediaElement interface: new Audio() must inherit property "currentSrc" with the proper type]
expected: FAIL

[HTMLMediaElement interface: new Audio() must inherit property "crossOrigin" with the proper type]
expected: FAIL

[HTMLMediaElement interface: new Audio() must inherit property "NETWORK_EMPTY" with the proper type]
expected: FAIL

Expand Down Expand Up @@ -6768,9 +6759,6 @@
[HTMLMediaElement interface: document.createElement("video") must inherit property "srcObject" with the proper type]
expected: FAIL

[HTMLMediaElement interface: document.createElement("video") must inherit property "crossOrigin" with the proper type]
expected: FAIL

[HTMLMediaElement interface: document.createElement("video") must inherit property "getStartDate()" with the proper type]
expected: FAIL

Expand All @@ -6786,9 +6774,6 @@
[HTMLMediaElement interface: document.createElement("audio") must inherit property "srcObject" with the proper type]
expected: FAIL

[HTMLMediaElement interface: document.createElement("audio") must inherit property "crossOrigin" with the proper type]
expected: FAIL

[HTMLMediaElement interface: document.createElement("audio") must inherit property "getStartDate()" with the proper type]
expected: FAIL

Expand All @@ -6804,9 +6789,6 @@
[HTMLMediaElement interface: new Audio() must inherit property "srcObject" with the proper type]
expected: FAIL

[HTMLMediaElement interface: new Audio() must inherit property "crossOrigin" with the proper type]
expected: FAIL

[HTMLMediaElement interface: new Audio() must inherit property "getStartDate()" with the proper type]
expected: FAIL

Expand All @@ -6819,9 +6801,6 @@
[HTMLMediaElement interface: new Audio() must inherit property "controls" with the proper type]
expected: FAIL

[HTMLMediaElement interface: attribute crossOrigin]
expected: FAIL

[HTMLMediaElement interface: operation getStartDate()]
expected: FAIL

Expand Down

This file was deleted.

0 comments on commit a2e0266

Please sign in to comment.