Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #19363 - nox:canplaytype-warning, r=ferjm

Browse source 
Use GeckoMedia and only that on platforms that support it

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19363)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-11-24 08:47:31 -06:00 • committed by GitHub
commit 3907953d80
1 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
components/script/dom/htmlmediaelement.rs
View file

@ -870,22 +870,29 @@ impl HTMLMediaElementMethods for HTMLMediaElement {
self.media_element_load_algorithm(); self.media_element_load_algorithm();
} }
// https://html.spec.whatwg.org/multipage/#dom-navigator-canplaytype
fn CanPlayType(&self, type_: DOMString) -> CanPlayTypeResult {
#[cfg(all( #[cfg(all(
any(target_os = "macos", target_os = "linux"), any(target_os = "macos", target_os = "linux"),
not(any(target_arch = "arm", target_arch = "aarch64"))))] not(any(target_arch = "arm", target_arch = "aarch64")),
{ ))]
// https://html.spec.whatwg.org/multipage/#dom-navigator-canplaytype
fn CanPlayType(&self, type_: DOMString) -> CanPlayTypeResult {
let gecko_media = match GeckoMedia::get() { let gecko_media = match GeckoMedia::get() {
Ok(gecko_media) => gecko_media, Ok(gecko_media) => gecko_media,
Err(_error) => return CanPlayTypeResult::_empty, Err(_) => return CanPlayTypeResult::_empty,
}; };
return match gecko_media.can_play_type(&type_) { match gecko_media.can_play_type(&type_) {
CanPlayType::No => CanPlayTypeResult::_empty, CanPlayType::No => CanPlayTypeResult::_empty,
CanPlayType::Maybe => CanPlayTypeResult::Maybe, CanPlayType::Maybe => CanPlayTypeResult::Maybe,
CanPlayType::Probably => CanPlayTypeResult::Probably CanPlayType::Probably => CanPlayTypeResult::Probably
};
} }
}
#[cfg(not(all(
any(target_os = "macos", target_os = "linux"),
not(any(target_arch = "arm", target_arch = "aarch64")),
)))]
// https://html.spec.whatwg.org/multipage/#dom-navigator-canplaytype
fn CanPlayType(&self, type_: DOMString) -> CanPlayTypeResult {
match type_.parse::<Mime>() { match type_.parse::<Mime>() {
Ok(Mime(TopLevel::Application, SubLevel::OctetStream, _)) | Ok(Mime(TopLevel::Application, SubLevel::OctetStream, _)) |
Err(_) => { Err(_) => {