1 files changed, 59 insertions, 21 deletions
diff --git a/components/script/dom/htmlaudioelement.rs b/components/script/dom/htmlaudioelement.rs
index bb8b12f06d6..db8f1877a6d 100644
--- a/components/script/dom/htmlaudioelement.rs
+++ b/components/script/dom/htmlaudioelement.rs
@@ -1,37 +1,75 @@
 /* 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::HTMLAudioElementBinding;
-use dom::bindings::js::Root;
-use dom::bindings::str::DOMString;
-use dom::document::Document;
-use dom::htmlmediaelement::HTMLMediaElement;
-use dom::node::Node;
+ * 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::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::{CustomElementCreationMode, Element, ElementCreator};
+use crate::dom::htmlmediaelement::HTMLMediaElement;
+use crate::dom::node::Node;
+use crate::dom::window::Window;
 use dom_struct::dom_struct;
-use html5ever_atoms::LocalName;
+use html5ever::{LocalName, Prefix, QualName};
 
 #[dom_struct]
 pub struct HTMLAudioElement {
-    htmlmediaelement: HTMLMediaElement
+    htmlmediaelement: HTMLMediaElement,
 }
 
 impl HTMLAudioElement {
-    fn new_inherited(local_name: LocalName,
-                     prefix: Option<DOMString>,
-                     document: &Document) -> HTMLAudioElement {
+    fn new_inherited(
+        local_name: LocalName,
+        prefix: Option<Prefix>,
+        document: &Document,
+    ) -> HTMLAudioElement {
         HTMLAudioElement {
-            htmlmediaelement:
-                HTMLMediaElement::new_inherited(local_name, prefix, document)
+            htmlmediaelement: HTMLMediaElement::new_inherited(local_name, prefix, document),
         }
     }
 
     #[allow(unrooted_must_root)]
-    pub fn new(local_name: LocalName,
-               prefix: Option<DOMString>,
-               document: &Document) -> Root<HTMLAudioElement> {
-        Node::reflect_node(box HTMLAudioElement::new_inherited(local_name, prefix, document),
-                           document,
-                           HTMLAudioElementBinding::Wrap)
+    pub fn new(
+        local_name: LocalName,
+        prefix: Option<Prefix>,
+        document: &Document,
+    ) -> DomRoot<HTMLAudioElement> {
+        Node::reflect_node(
+            Box::new(HTMLAudioElement::new_inherited(
+                local_name, prefix, document,
+            )),
+            document,
+        )
+    }
+
+    // https://html.spec.whatwg.org/multipage/#dom-audio
+    #[allow(non_snake_case)]
+    pub fn Audio(window: &Window, src: Option<DOMString>) -> Fallible<DomRoot<HTMLAudioElement>> {
+        let element = Element::create(
+            QualName::new(None, ns!(html), local_name!("audio")),
+            None,
+            &window.Document(),
+            ElementCreator::ScriptCreated,
+            CustomElementCreationMode::Synchronous,
+        );
+
+        let audio = DomRoot::downcast::<HTMLAudioElement>(element).unwrap();
+
+        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)
     }
 }