Skip to content

Commit

Permalink
Auto merge of #22227 - vn-ki:audio-const, r=jdm
Browse files Browse the repository at this point in the history
Implement Audio constructor

<!-- Please describe your changes on the following line: -->
Implement Audio constructor

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #21929 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because *tests were already there and the expectations were updated*.

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/22227)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Nov 20, 2018
2 parents c8b0501 + 684d108 commit 3fe83f1
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 101 deletions.
26 changes: 26 additions & 0 deletions components/script/dom/htmlaudioelement.rs
Expand Up @@ -2,11 +2,18 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */

use crate::dom::bindings::codegen::Bindings::ElementBinding::ElementBinding::ElementMethods;
use crate::dom::bindings::codegen::Bindings::HTMLAudioElementBinding;
use crate::dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
use crate::dom::bindings::error::Fallible;
use crate::dom::bindings::inheritance::Castable;
use crate::dom::bindings::root::DomRoot;
use crate::dom::bindings::str::DOMString;
use crate::dom::document::Document;
use crate::dom::element::Element;
use crate::dom::htmlmediaelement::HTMLMediaElement;
use crate::dom::node::Node;
use crate::dom::window::Window;
use dom_struct::dom_struct;
use html5ever::{LocalName, Prefix};

Expand Down Expand Up @@ -40,4 +47,23 @@ impl HTMLAudioElement {
HTMLAudioElementBinding::Wrap,
)
}

// https://html.spec.whatwg.org/multipage/#dom-audio
pub fn Audio(window: &Window, src: Option<DOMString>) -> Fallible<DomRoot<HTMLAudioElement>> {
let document = window.Document();
let audio = HTMLAudioElement::new(local_name!("audio"), None, &document);

audio
.upcast::<Element>()
.SetAttribute(DOMString::from("preload"), DOMString::from("auto"))
.expect("should be infallible");
if let Some(s) = src {
audio
.upcast::<Element>()
.SetAttribute(DOMString::from("src"), s)
.expect("should be infallible");
}

Ok(audio)
}
}
2 changes: 1 addition & 1 deletion components/script/dom/webidls/HTMLAudioElement.webidl
Expand Up @@ -3,5 +3,5 @@
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */

// https://html.spec.whatwg.org/multipage/#htmlaudioelement
[HTMLConstructor/*, NamedConstructor=Audio(optional DOMString src)*/]
[HTMLConstructor, NamedConstructor=Audio(optional DOMString src)]
interface HTMLAudioElement : HTMLMediaElement {};
87 changes: 0 additions & 87 deletions tests/wpt/metadata/html/dom/interfaces.https.html.ini
Expand Up @@ -6888,96 +6888,18 @@
[HTMLMediaElement interface: calling addTextTrack(TextTrackKind, DOMString, DOMString) on document.createElement("audio") with too few arguments must throw TypeError]
expected: FAIL

[HTMLAudioElement must be primary interface of new Audio()]
expected: FAIL

[Stringification of new Audio()]
expected: FAIL

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

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

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

[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

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

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

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

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

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

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

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

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

[HTMLMediaElement interface: calling canPlayType(DOMString) on new Audio() with too few arguments must throw TypeError]
expected: FAIL

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

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

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

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

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

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

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

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

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

[HTMLMediaElement interface: calling fastSeek(double) on new Audio() with too few arguments must throw TypeError]
expected: FAIL

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

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

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

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

Expand All @@ -6993,18 +6915,9 @@
[HTMLMediaElement interface: new Audio() must inherit property "ended" with the proper type]
expected: FAIL

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

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

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

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

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

Expand Down

This file was deleted.

This file was deleted.

@@ -1,5 +1,6 @@
[pause-remove-from-document.html]
type: testharness
expected: TIMEOUT
[paused state when removing from a document]
expected: FAIL
expected: TIMEOUT

@@ -1 +0,0 @@
disabled: for now
@@ -0,0 +1,4 @@
[audio_constructor.html]
[Calling Audio should throw]
expected: FAIL

2 changes: 1 addition & 1 deletion tests/wpt/mozilla/meta/MANIFEST.json
Expand Up @@ -27064,7 +27064,7 @@
"testharness"
],
"mozilla/interfaces.html": [
"fba582932f67521659378db241b6d52a3ada250d",
"b1de57409ad5e6f9fedeb8a34c9474b4e378ec0a",
"testharness"
],
"mozilla/interfaces.js": [
Expand Down
1 change: 1 addition & 0 deletions tests/wpt/mozilla/tests/mozilla/interfaces.html
Expand Up @@ -13,6 +13,7 @@
test_interfaces([
"AnalyserNode",
"Attr",
"Audio",
"AudioBuffer",
"AudioBufferSourceNode",
"AudioContext",
Expand Down

0 comments on commit 3fe83f1

Please sign in to comment.