Moved function html_constructor() from interface.rs to new file htmlconstructor.rs

4 files changed, 318 insertions, 310 deletions

diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py
index b408d0a670f..8d91f84a6e4 100644
--- a/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/components/script/dom/bindings/codegen/CodegenRust.py
@@ -5717,7 +5717,7 @@ def generate_imports(config, cgthings, descriptors, callbacks=None, dictionaries
         'dom::bindings::interface::define_guarded_constants',
         'dom::bindings::interface::define_guarded_methods',
         'dom::bindings::interface::define_guarded_properties',
-        'dom::bindings::interface::html_constructor',
+        'dom::bindings::htmlconstructor::html_constructor',
         'dom::bindings::interface::is_exposed_in',
         'dom::bindings::interface::pop_current_element_queue',
         'dom::bindings::interface::push_new_element_queue',
diff --git a/components/script/dom/bindings/htmlconstructor.rs b/components/script/dom/bindings/htmlconstructor.rs
new file mode 100644
index 00000000000..b376ad1941b
--- /dev/null
+++ b/components/script/dom/bindings/htmlconstructor.rs
@@ -0,0 +1,313 @@
+use dom::bindings::codegen::Bindings::HTMLAnchorElementBinding;
+use dom::bindings::codegen::Bindings::HTMLAreaElementBinding;
+use dom::bindings::codegen::Bindings::HTMLAudioElementBinding;
+use dom::bindings::codegen::Bindings::HTMLBRElementBinding;
+use dom::bindings::codegen::Bindings::HTMLBaseElementBinding;
+use dom::bindings::codegen::Bindings::HTMLBodyElementBinding;
+use dom::bindings::codegen::Bindings::HTMLButtonElementBinding;
+use dom::bindings::codegen::Bindings::HTMLCanvasElementBinding;
+use dom::bindings::codegen::Bindings::HTMLDListElementBinding;
+use dom::bindings::codegen::Bindings::HTMLDataElementBinding;
+use dom::bindings::codegen::Bindings::HTMLDataListElementBinding;
+use dom::bindings::codegen::Bindings::HTMLDetailsElementBinding;
+use dom::bindings::codegen::Bindings::HTMLDialogElementBinding;
+use dom::bindings::codegen::Bindings::HTMLDirectoryElementBinding;
+use dom::bindings::codegen::Bindings::HTMLDivElementBinding;
+use dom::bindings::codegen::Bindings::HTMLElementBinding;
+use dom::bindings::codegen::Bindings::HTMLEmbedElementBinding;
+use dom::bindings::codegen::Bindings::HTMLFieldSetElementBinding;
+use dom::bindings::codegen::Bindings::HTMLFontElementBinding;
+use dom::bindings::codegen::Bindings::HTMLFormElementBinding;
+use dom::bindings::codegen::Bindings::HTMLFrameElementBinding;
+use dom::bindings::codegen::Bindings::HTMLFrameSetElementBinding;
+use dom::bindings::codegen::Bindings::HTMLHRElementBinding;
+use dom::bindings::codegen::Bindings::HTMLHeadElementBinding;
+use dom::bindings::codegen::Bindings::HTMLHeadingElementBinding;
+use dom::bindings::codegen::Bindings::HTMLHtmlElementBinding;
+use dom::bindings::codegen::Bindings::HTMLIFrameElementBinding;
+use dom::bindings::codegen::Bindings::HTMLImageElementBinding;
+use dom::bindings::codegen::Bindings::HTMLInputElementBinding;
+use dom::bindings::codegen::Bindings::HTMLLIElementBinding;
+use dom::bindings::codegen::Bindings::HTMLLabelElementBinding;
+use dom::bindings::codegen::Bindings::HTMLLegendElementBinding;
+use dom::bindings::codegen::Bindings::HTMLLinkElementBinding;
+use dom::bindings::codegen::Bindings::HTMLMapElementBinding;
+use dom::bindings::codegen::Bindings::HTMLMetaElementBinding;
+use dom::bindings::codegen::Bindings::HTMLMeterElementBinding;
+use dom::bindings::codegen::Bindings::HTMLModElementBinding;
+use dom::bindings::codegen::Bindings::HTMLOListElementBinding;
+use dom::bindings::codegen::Bindings::HTMLObjectElementBinding;
+use dom::bindings::codegen::Bindings::HTMLOptGroupElementBinding;
+use dom::bindings::codegen::Bindings::HTMLOptionElementBinding;
+use dom::bindings::codegen::Bindings::HTMLOutputElementBinding;
+use dom::bindings::codegen::Bindings::HTMLParagraphElementBinding;
+use dom::bindings::codegen::Bindings::HTMLParamElementBinding;
+use dom::bindings::codegen::Bindings::HTMLPreElementBinding;
+use dom::bindings::codegen::Bindings::HTMLProgressElementBinding;
+use dom::bindings::codegen::Bindings::HTMLQuoteElementBinding;
+use dom::bindings::codegen::Bindings::HTMLScriptElementBinding;
+use dom::bindings::codegen::Bindings::HTMLSelectElementBinding;
+use dom::bindings::codegen::Bindings::HTMLSourceElementBinding;
+use dom::bindings::codegen::Bindings::HTMLSpanElementBinding;
+use dom::bindings::codegen::Bindings::HTMLStyleElementBinding;
+use dom::bindings::codegen::Bindings::HTMLTableCaptionElementBinding;
+use dom::bindings::codegen::Bindings::HTMLTableColElementBinding;
+use dom::bindings::codegen::Bindings::HTMLTableDataCellElementBinding;
+use dom::bindings::codegen::Bindings::HTMLTableElementBinding;
+use dom::bindings::codegen::Bindings::HTMLTableHeaderCellElementBinding;
+use dom::bindings::codegen::Bindings::HTMLTableRowElementBinding;
+use dom::bindings::codegen::Bindings::HTMLTableSectionElementBinding;
+use dom::bindings::codegen::Bindings::HTMLTemplateElementBinding;
+use dom::bindings::codegen::Bindings::HTMLTextAreaElementBinding;
+use dom::bindings::codegen::Bindings::HTMLTimeElementBinding;
+use dom::bindings::codegen::Bindings::HTMLTitleElementBinding;
+use dom::bindings::codegen::Bindings::HTMLTrackElementBinding;
+use dom::bindings::codegen::Bindings::HTMLUListElementBinding;
+use dom::bindings::codegen::Bindings::HTMLVideoElementBinding;
+use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
+use dom::bindings::conversions::DerivedFrom;
+use dom::bindings::error::{Error, Fallible};
+use dom::bindings::root::DomRoot;
+use dom::create::create_native_html_element;
+use dom::customelementregistry::ConstructionStackEntry;
+use dom::element::{CustomElementState, Element, ElementCreator};
+use dom::htmlelement::HTMLElement;
+use dom::window::Window;
+use html5ever::interface::QualName;
+use html5ever::LocalName;
+use js::glue::{UnwrapObject};
+use js::jsapi::HandleObject;
+use js::jsapi::{CallArgs, CurrentGlobalOrNull};
+use js::jsapi::{JSAutoCompartment, JSContext};
+use js::jsapi::MutableHandleObject;
+use std::ptr;
+
+// https://html.spec.whatwg.org/multipage/#htmlconstructor
+pub unsafe fn html_constructor<T>(window: &Window, call_args: &CallArgs) -> Fallible<DomRoot<T>>
+                                  where T: DerivedFrom<Element> {
+    let document = window.Document();
+
+    // Step 1
+    let registry = window.CustomElements();
+
+    // Step 2 is checked in the generated caller code
+
+    // Step 3
+    rooted!(in(window.get_cx()) let new_target = call_args.new_target().to_object());
+    let definition = match registry.lookup_definition_by_constructor(new_target.handle()) {
+        Some(definition) => definition,
+        None => return Err(Error::Type("No custom element definition found for new.target".to_owned())),
+    };
+
+    rooted!(in(window.get_cx()) let callee = UnwrapObject(call_args.callee(), 1));
+    if callee.is_null() {
+        return Err(Error::Security);
+    }
+
+    {
+        let _ac = JSAutoCompartment::new(window.get_cx(), callee.get());
+        rooted!(in(window.get_cx()) let mut constructor = ptr::null_mut());
+        rooted!(in(window.get_cx()) let global_object = CurrentGlobalOrNull(window.get_cx()));
+
+        if definition.is_autonomous() {
+            // Step 4
+            // Since this element is autonomous, its active function object must be the HTMLElement
+
+            // Retrieve the constructor object for HTMLElement
+            HTMLElementBinding::GetConstructorObject(window.get_cx(), global_object.handle(), constructor.handle_mut());
+
+        } else {
+            // Step 5
+            get_constructor_object_from_local_name(definition.local_name.clone(),
+                                                   window.get_cx(),
+                                                   global_object.handle(),
+                                                   constructor.handle_mut());
+        }
+        // Callee must be the same as the element interface's constructor object.
+        if constructor.get() != callee.get() {
+            return Err(Error::Type("Custom element does not extend the proper interface".to_owned()));
+        }
+    }
+
+    let entry = definition.construction_stack.borrow().last().cloned();
+    match entry {
+        // Step 8
+        None => {
+            // Step 8.1
+            let name = QualName::new(None, ns!(html), definition.local_name.clone());
+            let element = if definition.is_autonomous() {
+                DomRoot::upcast(HTMLElement::new(name.local, None, &*document))
+            } else {
+                create_native_html_element(name, None, &*document, ElementCreator::ScriptCreated)
+            };
+
+            // Step 8.2 is performed in the generated caller code.
+
+            // Step 8.3
+            element.set_custom_element_state(CustomElementState::Custom);
+
+            // Step 8.4
+            element.set_custom_element_definition(definition.clone());
+
+            // Step 8.5
+            DomRoot::downcast(element).ok_or(Error::InvalidState)
+        },
+        // Step 9
+        Some(ConstructionStackEntry::Element(element)) => {
+            // Step 11 is performed in the generated caller code.
+
+            // Step 12
+            let mut construction_stack = definition.construction_stack.borrow_mut();
+            construction_stack.pop();
+            construction_stack.push(ConstructionStackEntry::AlreadyConstructedMarker);
+
+            // Step 13
+            DomRoot::downcast(element).ok_or(Error::InvalidState)
+        },
+        // Step 10
+        Some(ConstructionStackEntry::AlreadyConstructedMarker) => Err(Error::InvalidState),
+    }
+}
+                                  
+                                  /// Returns the constructor object for the element associated with the given local name.
+/// This list should only include elements marked with the [HTMLConstructor] extended attribute.
+pub fn get_constructor_object_from_local_name(name: LocalName,
+                                              cx: *mut JSContext,
+                                              global: HandleObject,
+                                              rval: MutableHandleObject)
+                                              -> bool {
+    macro_rules! get_constructor(
+        ($binding:ident) => ({
+            unsafe { $binding::GetConstructorObject(cx, global, rval); }
+            true
+        })
+    );
+
+    match name {
+        local_name!("a")          => get_constructor!(HTMLAnchorElementBinding),
+        local_name!("abbr")       => get_constructor!(HTMLElementBinding),
+        local_name!("acronym")    => get_constructor!(HTMLElementBinding),
+        local_name!("address")    => get_constructor!(HTMLElementBinding),
+        local_name!("area")       => get_constructor!(HTMLAreaElementBinding),
+        local_name!("article")    => get_constructor!(HTMLElementBinding),
+        local_name!("aside")      => get_constructor!(HTMLElementBinding),
+        local_name!("audio")      => get_constructor!(HTMLAudioElementBinding),
+        local_name!("b")          => get_constructor!(HTMLElementBinding),
+        local_name!("base")       => get_constructor!(HTMLBaseElementBinding),
+        local_name!("bdi")        => get_constructor!(HTMLElementBinding),
+        local_name!("bdo")        => get_constructor!(HTMLElementBinding),
+        local_name!("big")        => get_constructor!(HTMLElementBinding),
+        local_name!("blockquote") => get_constructor!(HTMLQuoteElementBinding),
+        local_name!("body")       => get_constructor!(HTMLBodyElementBinding),
+        local_name!("br")         => get_constructor!(HTMLBRElementBinding),
+        local_name!("button")     => get_constructor!(HTMLButtonElementBinding),
+        local_name!("canvas")     => get_constructor!(HTMLCanvasElementBinding),
+        local_name!("caption")    => get_constructor!(HTMLTableCaptionElementBinding),
+        local_name!("center")     => get_constructor!(HTMLElementBinding),
+        local_name!("cite")       => get_constructor!(HTMLElementBinding),
+        local_name!("code")       => get_constructor!(HTMLElementBinding),
+        local_name!("col")        => get_constructor!(HTMLTableColElementBinding),
+        local_name!("colgroup")   => get_constructor!(HTMLTableColElementBinding),
+        local_name!("data")       => get_constructor!(HTMLDataElementBinding),
+        local_name!("datalist")   => get_constructor!(HTMLDataListElementBinding),
+        local_name!("dd")         => get_constructor!(HTMLElementBinding),
+        local_name!("del")        => get_constructor!(HTMLModElementBinding),
+        local_name!("details")    => get_constructor!(HTMLDetailsElementBinding),
+        local_name!("dfn")        => get_constructor!(HTMLElementBinding),
+        local_name!("dialog")     => get_constructor!(HTMLDialogElementBinding),
+        local_name!("dir")        => get_constructor!(HTMLDirectoryElementBinding),
+        local_name!("div")        => get_constructor!(HTMLDivElementBinding),
+        local_name!("dl")         => get_constructor!(HTMLDListElementBinding),
+        local_name!("dt")         => get_constructor!(HTMLElementBinding),
+        local_name!("em")         => get_constructor!(HTMLElementBinding),
+        local_name!("embed")      => get_constructor!(HTMLEmbedElementBinding),
+        local_name!("fieldset")   => get_constructor!(HTMLFieldSetElementBinding),
+        local_name!("figcaption") => get_constructor!(HTMLElementBinding),
+        local_name!("figure")     => get_constructor!(HTMLElementBinding),
+        local_name!("font")       => get_constructor!(HTMLFontElementBinding),
+        local_name!("footer")     => get_constructor!(HTMLElementBinding),
+        local_name!("form")       => get_constructor!(HTMLFormElementBinding),
+        local_name!("frame")      => get_constructor!(HTMLFrameElementBinding),
+        local_name!("frameset")   => get_constructor!(HTMLFrameSetElementBinding),
+        local_name!("h1")         => get_constructor!(HTMLHeadingElementBinding),
+        local_name!("h2")         => get_constructor!(HTMLHeadingElementBinding),
+        local_name!("h3")         => get_constructor!(HTMLHeadingElementBinding),
+        local_name!("h4")         => get_constructor!(HTMLHeadingElementBinding),
+        local_name!("h5")         => get_constructor!(HTMLHeadingElementBinding),
+        local_name!("h6")         => get_constructor!(HTMLHeadingElementBinding),
+        local_name!("head")       => get_constructor!(HTMLHeadElementBinding),
+        local_name!("header")     => get_constructor!(HTMLElementBinding),
+        local_name!("hgroup")     => get_constructor!(HTMLElementBinding),
+        local_name!("hr")         => get_constructor!(HTMLHRElementBinding),
+        local_name!("html")       => get_constructor!(HTMLHtmlElementBinding),
+        local_name!("i")          => get_constructor!(HTMLElementBinding),
+        local_name!("iframe")     => get_constructor!(HTMLIFrameElementBinding),
+        local_name!("img")        => get_constructor!(HTMLImageElementBinding),
+        local_name!("input")      => get_constructor!(HTMLInputElementBinding),
+        local_name!("ins")        => get_constructor!(HTMLModElementBinding),
+        local_name!("kbd")        => get_constructor!(HTMLElementBinding),
+        local_name!("label")      => get_constructor!(HTMLLabelElementBinding),
+        local_name!("legend")     => get_constructor!(HTMLLegendElementBinding),
+        local_name!("li")         => get_constructor!(HTMLLIElementBinding),
+        local_name!("link")       => get_constructor!(HTMLLinkElementBinding),
+        local_name!("listing")    => get_constructor!(HTMLPreElementBinding),
+        local_name!("main")       => get_constructor!(HTMLElementBinding),
+        local_name!("map")        => get_constructor!(HTMLMapElementBinding),
+        local_name!("mark")       => get_constructor!(HTMLElementBinding),
+        local_name!("marquee")    => get_constructor!(HTMLElementBinding),
+        local_name!("meta")       => get_constructor!(HTMLMetaElementBinding),
+        local_name!("meter")      => get_constructor!(HTMLMeterElementBinding),
+        local_name!("nav")        => get_constructor!(HTMLElementBinding),
+        local_name!("nobr")       => get_constructor!(HTMLElementBinding),
+        local_name!("noframes")   => get_constructor!(HTMLElementBinding),
+        local_name!("noscript")   => get_constructor!(HTMLElementBinding),
+        local_name!("object")     => get_constructor!(HTMLObjectElementBinding),
+        local_name!("ol")         => get_constructor!(HTMLOListElementBinding),
+        local_name!("optgroup")   => get_constructor!(HTMLOptGroupElementBinding),
+        local_name!("option")     => get_constructor!(HTMLOptionElementBinding),
+        local_name!("output")     => get_constructor!(HTMLOutputElementBinding),
+        local_name!("p")          => get_constructor!(HTMLParagraphElementBinding),
+        local_name!("param")      => get_constructor!(HTMLParamElementBinding),
+        local_name!("plaintext")  => get_constructor!(HTMLPreElementBinding),
+        local_name!("pre")        => get_constructor!(HTMLPreElementBinding),
+        local_name!("progress")   => get_constructor!(HTMLProgressElementBinding),
+        local_name!("q")          => get_constructor!(HTMLQuoteElementBinding),
+        local_name!("rp")         => get_constructor!(HTMLElementBinding),
+        local_name!("rt")         => get_constructor!(HTMLElementBinding),
+        local_name!("ruby")       => get_constructor!(HTMLElementBinding),
+        local_name!("s")          => get_constructor!(HTMLElementBinding),
+        local_name!("samp")       => get_constructor!(HTMLElementBinding),
+        local_name!("script")     => get_constructor!(HTMLScriptElementBinding),
+        local_name!("section")    => get_constructor!(HTMLElementBinding),
+        local_name!("select")     => get_constructor!(HTMLSelectElementBinding),
+        local_name!("small")      => get_constructor!(HTMLElementBinding),
+        local_name!("source")     => get_constructor!(HTMLSourceElementBinding),
+        local_name!("span")       => get_constructor!(HTMLSpanElementBinding),
+        local_name!("strike")     => get_constructor!(HTMLElementBinding),
+        local_name!("strong")     => get_constructor!(HTMLElementBinding),
+        local_name!("style")      => get_constructor!(HTMLStyleElementBinding),
+        local_name!("sub")        => get_constructor!(HTMLElementBinding),
+        local_name!("summary")    => get_constructor!(HTMLElementBinding),
+        local_name!("sup")        => get_constructor!(HTMLElementBinding),
+        local_name!("table")      => get_constructor!(HTMLTableElementBinding),
+        local_name!("tbody")      => get_constructor!(HTMLTableSectionElementBinding),
+        local_name!("td")         => get_constructor!(HTMLTableDataCellElementBinding),
+        local_name!("template")   => get_constructor!(HTMLTemplateElementBinding),
+        local_name!("textarea")   => get_constructor!(HTMLTextAreaElementBinding),
+        local_name!("tfoot")      => get_constructor!(HTMLTableSectionElementBinding),
+        local_name!("th")         => get_constructor!(HTMLTableHeaderCellElementBinding),
+        local_name!("thead")      => get_constructor!(HTMLTableSectionElementBinding),
+        local_name!("time")       => get_constructor!(HTMLTimeElementBinding),
+        local_name!("title")      => get_constructor!(HTMLTitleElementBinding),
+        local_name!("tr")         => get_constructor!(HTMLTableRowElementBinding),
+        local_name!("tt")         => get_constructor!(HTMLElementBinding),
+        local_name!("track")      => get_constructor!(HTMLTrackElementBinding),
+        local_name!("u")          => get_constructor!(HTMLElementBinding),
+        local_name!("ul")         => get_constructor!(HTMLUListElementBinding),
+        local_name!("var")        => get_constructor!(HTMLElementBinding),
+        local_name!("video")      => get_constructor!(HTMLVideoElementBinding),
+        local_name!("wbr")        => get_constructor!(HTMLElementBinding),
+        local_name!("xmp")        => get_constructor!(HTMLPreElementBinding),
+        _                         => false,
+    }
+}
diff --git a/components/script/dom/bindings/interface.rs b/components/script/dom/bindings/interface.rs
index 75b770c4141..a6489291849 100644
--- a/components/script/dom/bindings/interface.rs
+++ b/components/script/dom/bindings/interface.rs
@@ -4,91 +4,15 @@
 
 //! Machinery to initialise interface prototype objects and interface objects.
 
-use dom::bindings::codegen::Bindings::HTMLAnchorElementBinding;
-use dom::bindings::codegen::Bindings::HTMLAreaElementBinding;
-use dom::bindings::codegen::Bindings::HTMLAudioElementBinding;
-use dom::bindings::codegen::Bindings::HTMLBRElementBinding;
-use dom::bindings::codegen::Bindings::HTMLBaseElementBinding;
-use dom::bindings::codegen::Bindings::HTMLBodyElementBinding;
-use dom::bindings::codegen::Bindings::HTMLButtonElementBinding;
-use dom::bindings::codegen::Bindings::HTMLCanvasElementBinding;
-use dom::bindings::codegen::Bindings::HTMLDListElementBinding;
-use dom::bindings::codegen::Bindings::HTMLDataElementBinding;
-use dom::bindings::codegen::Bindings::HTMLDataListElementBinding;
-use dom::bindings::codegen::Bindings::HTMLDetailsElementBinding;
-use dom::bindings::codegen::Bindings::HTMLDialogElementBinding;
-use dom::bindings::codegen::Bindings::HTMLDirectoryElementBinding;
-use dom::bindings::codegen::Bindings::HTMLDivElementBinding;
-use dom::bindings::codegen::Bindings::HTMLElementBinding;
-use dom::bindings::codegen::Bindings::HTMLEmbedElementBinding;
-use dom::bindings::codegen::Bindings::HTMLFieldSetElementBinding;
-use dom::bindings::codegen::Bindings::HTMLFontElementBinding;
-use dom::bindings::codegen::Bindings::HTMLFormElementBinding;
-use dom::bindings::codegen::Bindings::HTMLFrameElementBinding;
-use dom::bindings::codegen::Bindings::HTMLFrameSetElementBinding;
-use dom::bindings::codegen::Bindings::HTMLHRElementBinding;
-use dom::bindings::codegen::Bindings::HTMLHeadElementBinding;
-use dom::bindings::codegen::Bindings::HTMLHeadingElementBinding;
-use dom::bindings::codegen::Bindings::HTMLHtmlElementBinding;
-use dom::bindings::codegen::Bindings::HTMLIFrameElementBinding;
-use dom::bindings::codegen::Bindings::HTMLImageElementBinding;
-use dom::bindings::codegen::Bindings::HTMLInputElementBinding;
-use dom::bindings::codegen::Bindings::HTMLLIElementBinding;
-use dom::bindings::codegen::Bindings::HTMLLabelElementBinding;
-use dom::bindings::codegen::Bindings::HTMLLegendElementBinding;
-use dom::bindings::codegen::Bindings::HTMLLinkElementBinding;
-use dom::bindings::codegen::Bindings::HTMLMapElementBinding;
-use dom::bindings::codegen::Bindings::HTMLMetaElementBinding;
-use dom::bindings::codegen::Bindings::HTMLMeterElementBinding;
-use dom::bindings::codegen::Bindings::HTMLModElementBinding;
-use dom::bindings::codegen::Bindings::HTMLOListElementBinding;
-use dom::bindings::codegen::Bindings::HTMLObjectElementBinding;
-use dom::bindings::codegen::Bindings::HTMLOptGroupElementBinding;
-use dom::bindings::codegen::Bindings::HTMLOptionElementBinding;
-use dom::bindings::codegen::Bindings::HTMLOutputElementBinding;
-use dom::bindings::codegen::Bindings::HTMLParagraphElementBinding;
-use dom::bindings::codegen::Bindings::HTMLParamElementBinding;
-use dom::bindings::codegen::Bindings::HTMLPreElementBinding;
-use dom::bindings::codegen::Bindings::HTMLProgressElementBinding;
-use dom::bindings::codegen::Bindings::HTMLQuoteElementBinding;
-use dom::bindings::codegen::Bindings::HTMLScriptElementBinding;
-use dom::bindings::codegen::Bindings::HTMLSelectElementBinding;
-use dom::bindings::codegen::Bindings::HTMLSourceElementBinding;
-use dom::bindings::codegen::Bindings::HTMLSpanElementBinding;
-use dom::bindings::codegen::Bindings::HTMLStyleElementBinding;
-use dom::bindings::codegen::Bindings::HTMLTableCaptionElementBinding;
-use dom::bindings::codegen::Bindings::HTMLTableColElementBinding;
-use dom::bindings::codegen::Bindings::HTMLTableDataCellElementBinding;
-use dom::bindings::codegen::Bindings::HTMLTableElementBinding;
-use dom::bindings::codegen::Bindings::HTMLTableHeaderCellElementBinding;
-use dom::bindings::codegen::Bindings::HTMLTableRowElementBinding;
-use dom::bindings::codegen::Bindings::HTMLTableSectionElementBinding;
-use dom::bindings::codegen::Bindings::HTMLTemplateElementBinding;
-use dom::bindings::codegen::Bindings::HTMLTextAreaElementBinding;
-use dom::bindings::codegen::Bindings::HTMLTimeElementBinding;
-use dom::bindings::codegen::Bindings::HTMLTitleElementBinding;
-use dom::bindings::codegen::Bindings::HTMLTrackElementBinding;
-use dom::bindings::codegen::Bindings::HTMLUListElementBinding;
-use dom::bindings::codegen::Bindings::HTMLVideoElementBinding;
-use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
 use dom::bindings::codegen::InterfaceObjectMap::Globals;
 use dom::bindings::codegen::PrototypeList;
 use dom::bindings::constant::{ConstantSpec, define_constants};
-use dom::bindings::conversions::{DOM_OBJECT_SLOT, DerivedFrom, get_dom_class};
-use dom::bindings::error::{Error, Fallible};
+use dom::bindings::conversions::{DOM_OBJECT_SLOT, get_dom_class};
 use dom::bindings::guard::Guard;
-use dom::bindings::root::DomRoot;
 use dom::bindings::utils::{DOM_PROTOTYPE_SLOT, ProtoOrIfaceArray, get_proto_or_iface_array};
-use dom::create::create_native_html_element;
-use dom::customelementregistry::ConstructionStackEntry;
-use dom::element::{CustomElementState, Element, ElementCreator};
-use dom::htmlelement::HTMLElement;
-use dom::window::Window;
-use html5ever::LocalName;
-use html5ever::interface::QualName;
 use js::error::throw_type_error;
-use js::glue::{RUST_SYMBOL_TO_JSID, UncheckedUnwrapObject, UnwrapObject};
-use js::jsapi::{CallArgs, Class, ClassOps, CompartmentOptions, CurrentGlobalOrNull};
+use js::glue::{RUST_SYMBOL_TO_JSID, UncheckedUnwrapObject};
+use js::jsapi::{Class, ClassOps, CompartmentOptions};
 use js::jsapi::{GetGlobalForObjectCrossCompartment, GetWellKnownSymbol, HandleObject, HandleValue};
 use js::jsapi::{JSAutoCompartment, JSClass, JSContext, JSFUN_CONSTRUCTOR, JSFunctionSpec, JSObject};
 use js::jsapi::{JSPROP_PERMANENT, JSPROP_READONLY, JSPROP_RESOLVING};
@@ -235,93 +159,6 @@ pub unsafe fn create_global_object(
     JS_FireOnNewGlobalObject(cx, rval.handle());
 }
 
-// https://html.spec.whatwg.org/multipage/#htmlconstructor
-pub unsafe fn html_constructor<T>(window: &Window, call_args: &CallArgs) -> Fallible<DomRoot<T>>
-                                  where T: DerivedFrom<Element> {
-    let document = window.Document();
-
-    // Step 1
-    let registry = window.CustomElements();
-
-    // Step 2 is checked in the generated caller code
-
-    // Step 3
-    rooted!(in(window.get_cx()) let new_target = call_args.new_target().to_object());
-    let definition = match registry.lookup_definition_by_constructor(new_target.handle()) {
-        Some(definition) => definition,
-        None => return Err(Error::Type("No custom element definition found for new.target".to_owned())),
-    };
-
-    rooted!(in(window.get_cx()) let callee = UnwrapObject(call_args.callee(), 1));
-    if callee.is_null() {
-        return Err(Error::Security);
-    }
-
-    {
-        let _ac = JSAutoCompartment::new(window.get_cx(), callee.get());
-        rooted!(in(window.get_cx()) let mut constructor = ptr::null_mut());
-        rooted!(in(window.get_cx()) let global_object = CurrentGlobalOrNull(window.get_cx()));
-
-        if definition.is_autonomous() {
-            // Step 4
-            // Since this element is autonomous, its active function object must be the HTMLElement
-
-            // Retrieve the constructor object for HTMLElement
-            HTMLElementBinding::GetConstructorObject(window.get_cx(), global_object.handle(), constructor.handle_mut());
-
-        } else {
-            // Step 5
-            get_constructor_object_from_local_name(definition.local_name.clone(),
-                                                   window.get_cx(),
-                                                   global_object.handle(),
-                                                   constructor.handle_mut());
-        }
-        // Callee must be the same as the element interface's constructor object.
-        if constructor.get() != callee.get() {
-            return Err(Error::Type("Custom element does not extend the proper interface".to_owned()));
-        }
-    }
-
-    let entry = definition.construction_stack.borrow().last().cloned();
-    match entry {
-        // Step 8
-        None => {
-            // Step 8.1
-            let name = QualName::new(None, ns!(html), definition.local_name.clone());
-            let element = if definition.is_autonomous() {
-                DomRoot::upcast(HTMLElement::new(name.local, None, &*document))
-            } else {
-                create_native_html_element(name, None, &*document, ElementCreator::ScriptCreated)
-            };
-
-            // Step 8.2 is performed in the generated caller code.
-
-            // Step 8.3
-            element.set_custom_element_state(CustomElementState::Custom);
-
-            // Step 8.4
-            element.set_custom_element_definition(definition.clone());
-
-            // Step 8.5
-            DomRoot::downcast(element).ok_or(Error::InvalidState)
-        },
-        // Step 9
-        Some(ConstructionStackEntry::Element(element)) => {
-            // Step 11 is performed in the generated caller code.
-
-            // Step 12
-            let mut construction_stack = definition.construction_stack.borrow_mut();
-            construction_stack.pop();
-            construction_stack.push(ConstructionStackEntry::AlreadyConstructedMarker);
-
-            // Step 13
-            DomRoot::downcast(element).ok_or(Error::InvalidState)
-        },
-        // Step 10
-        Some(ConstructionStackEntry::AlreadyConstructedMarker) => Err(Error::InvalidState),
-    }
-}
-
 pub fn push_new_element_queue() {
     ScriptThread::push_new_element_queue();
 }
@@ -646,146 +483,3 @@ unsafe extern "C" fn non_new_constructor(
     throw_type_error(cx, "This constructor needs to be called with `new`.");
     false
 }
-
-/// Returns the constructor object for the element associated with the given local name.
-/// This list should only include elements marked with the [HTMLConstructor] extended attribute.
-pub fn get_constructor_object_from_local_name(name: LocalName,
-                                              cx: *mut JSContext,
-                                              global: HandleObject,
-                                              rval: MutableHandleObject)
-                                              -> bool {
-    macro_rules! get_constructor(
-        ($binding:ident) => ({
-            unsafe { $binding::GetConstructorObject(cx, global, rval); }
-            true
-        })
-    );
-
-    match name {
-        local_name!("a")          => get_constructor!(HTMLAnchorElementBinding),
-        local_name!("abbr")       => get_constructor!(HTMLElementBinding),
-        local_name!("acronym")    => get_constructor!(HTMLElementBinding),
-        local_name!("address")    => get_constructor!(HTMLElementBinding),
-        local_name!("area")       => get_constructor!(HTMLAreaElementBinding),
-        local_name!("article")    => get_constructor!(HTMLElementBinding),
-        local_name!("aside")      => get_constructor!(HTMLElementBinding),
-        local_name!("audio")      => get_constructor!(HTMLAudioElementBinding),
-        local_name!("b")          => get_constructor!(HTMLElementBinding),
-        local_name!("base")       => get_constructor!(HTMLBaseElementBinding),
-        local_name!("bdi")        => get_constructor!(HTMLElementBinding),
-        local_name!("bdo")        => get_constructor!(HTMLElementBinding),
-        local_name!("big")        => get_constructor!(HTMLElementBinding),
-        local_name!("blockquote") => get_constructor!(HTMLQuoteElementBinding),
-        local_name!("body")       => get_constructor!(HTMLBodyElementBinding),
-        local_name!("br")         => get_constructor!(HTMLBRElementBinding),
-        local_name!("button")     => get_constructor!(HTMLButtonElementBinding),
-        local_name!("canvas")     => get_constructor!(HTMLCanvasElementBinding),
-        local_name!("caption")    => get_constructor!(HTMLTableCaptionElementBinding),
-        local_name!("center")     => get_constructor!(HTMLElementBinding),
-        local_name!("cite")       => get_constructor!(HTMLElementBinding),
-        local_name!("code")       => get_constructor!(HTMLElementBinding),
-        local_name!("col")        => get_constructor!(HTMLTableColElementBinding),
-        local_name!("colgroup")   => get_constructor!(HTMLTableColElementBinding),
-        local_name!("data")       => get_constructor!(HTMLDataElementBinding),
-        local_name!("datalist")   => get_constructor!(HTMLDataListElementBinding),
-        local_name!("dd")         => get_constructor!(HTMLElementBinding),
-        local_name!("del")        => get_constructor!(HTMLModElementBinding),
-        local_name!("details")    => get_constructor!(HTMLDetailsElementBinding),
-        local_name!("dfn")        => get_constructor!(HTMLElementBinding),
-        local_name!("dialog")     => get_constructor!(HTMLDialogElementBinding),
-        local_name!("dir")        => get_constructor!(HTMLDirectoryElementBinding),
-        local_name!("div")        => get_constructor!(HTMLDivElementBinding),
-        local_name!("dl")         => get_constructor!(HTMLDListElementBinding),
-        local_name!("dt")         => get_constructor!(HTMLElementBinding),
-        local_name!("em")         => get_constructor!(HTMLElementBinding),
-        local_name!("embed")      => get_constructor!(HTMLEmbedElementBinding),
-        local_name!("fieldset")   => get_constructor!(HTMLFieldSetElementBinding),
-        local_name!("figcaption") => get_constructor!(HTMLElementBinding),
-        local_name!("figure")     => get_constructor!(HTMLElementBinding),
-        local_name!("font")       => get_constructor!(HTMLFontElementBinding),
-        local_name!("footer")     => get_constructor!(HTMLElementBinding),
-        local_name!("form")       => get_constructor!(HTMLFormElementBinding),
-        local_name!("frame")      => get_constructor!(HTMLFrameElementBinding),
-        local_name!("frameset")   => get_constructor!(HTMLFrameSetElementBinding),
-        local_name!("h1")         => get_constructor!(HTMLHeadingElementBinding),
-        local_name!("h2")         => get_constructor!(HTMLHeadingElementBinding),
-        local_name!("h3")         => get_constructor!(HTMLHeadingElementBinding),
-        local_name!("h4")         => get_constructor!(HTMLHeadingElementBinding),
-        local_name!("h5")         => get_constructor!(HTMLHeadingElementBinding),
-        local_name!("h6")         => get_constructor!(HTMLHeadingElementBinding),
-        local_name!("head")       => get_constructor!(HTMLHeadElementBinding),
-        local_name!("header")     => get_constructor!(HTMLElementBinding),
-        local_name!("hgroup")     => get_constructor!(HTMLElementBinding),
-        local_name!("hr")         => get_constructor!(HTMLHRElementBinding),
-        local_name!("html")       => get_constructor!(HTMLHtmlElementBinding),
-        local_name!("i")          => get_constructor!(HTMLElementBinding),
-        local_name!("iframe")     => get_constructor!(HTMLIFrameElementBinding),
-        local_name!("img")        => get_constructor!(HTMLImageElementBinding),
-        local_name!("input")      => get_constructor!(HTMLInputElementBinding),
-        local_name!("ins")        => get_constructor!(HTMLModElementBinding),
-        local_name!("kbd")        => get_constructor!(HTMLElementBinding),
-        local_name!("label")      => get_constructor!(HTMLLabelElementBinding),
-        local_name!("legend")     => get_constructor!(HTMLLegendElementBinding),
-        local_name!("li")         => get_constructor!(HTMLLIElementBinding),
-        local_name!("link")       => get_constructor!(HTMLLinkElementBinding),
-        local_name!("listing")    => get_constructor!(HTMLPreElementBinding),
-        local_name!("main")       => get_constructor!(HTMLElementBinding),
-        local_name!("map")        => get_constructor!(HTMLMapElementBinding),
-        local_name!("mark")       => get_constructor!(HTMLElementBinding),
-        local_name!("marquee")    => get_constructor!(HTMLElementBinding),
-        local_name!("meta")       => get_constructor!(HTMLMetaElementBinding),
-        local_name!("meter")      => get_constructor!(HTMLMeterElementBinding),
-        local_name!("nav")        => get_constructor!(HTMLElementBinding),
-        local_name!("nobr")       => get_constructor!(HTMLElementBinding),
-        local_name!("noframes")   => get_constructor!(HTMLElementBinding),
-        local_name!("noscript")   => get_constructor!(HTMLElementBinding),
-        local_name!("object")     => get_constructor!(HTMLObjectElementBinding),
-        local_name!("ol")         => get_constructor!(HTMLOListElementBinding),
-        local_name!("optgroup")   => get_constructor!(HTMLOptGroupElementBinding),
-        local_name!("option")     => get_constructor!(HTMLOptionElementBinding),
-        local_name!("output")     => get_constructor!(HTMLOutputElementBinding),
-        local_name!("p")          => get_constructor!(HTMLParagraphElementBinding),
-        local_name!("param")      => get_constructor!(HTMLParamElementBinding),
-        local_name!("plaintext")  => get_constructor!(HTMLPreElementBinding),
-        local_name!("pre")        => get_constructor!(HTMLPreElementBinding),
-        local_name!("progress")   => get_constructor!(HTMLProgressElementBinding),
-        local_name!("q")          => get_constructor!(HTMLQuoteElementBinding),
-        local_name!("rp")         => get_constructor!(HTMLElementBinding),
-        local_name!("rt")         => get_constructor!(HTMLElementBinding),
-        local_name!("ruby")       => get_constructor!(HTMLElementBinding),
-        local_name!("s")          => get_constructor!(HTMLElementBinding),
-        local_name!("samp")       => get_constructor!(HTMLElementBinding),
-        local_name!("script")     => get_constructor!(HTMLScriptElementBinding),
-        local_name!("section")    => get_constructor!(HTMLElementBinding),
-        local_name!("select")     => get_constructor!(HTMLSelectElementBinding),
-        local_name!("small")      => get_constructor!(HTMLElementBinding),
-        local_name!("source")     => get_constructor!(HTMLSourceElementBinding),
-        local_name!("span")       => get_constructor!(HTMLSpanElementBinding),
-        local_name!("strike")     => get_constructor!(HTMLElementBinding),
-        local_name!("strong")     => get_constructor!(HTMLElementBinding),
-        local_name!("style")      => get_constructor!(HTMLStyleElementBinding),
-        local_name!("sub")        => get_constructor!(HTMLElementBinding),
-        local_name!("summary")    => get_constructor!(HTMLElementBinding),
-        local_name!("sup")        => get_constructor!(HTMLElementBinding),
-        local_name!("table")      => get_constructor!(HTMLTableElementBinding),
-        local_name!("tbody")      => get_constructor!(HTMLTableSectionElementBinding),
-        local_name!("td")         => get_constructor!(HTMLTableDataCellElementBinding),
-        local_name!("template")   => get_constructor!(HTMLTemplateElementBinding),
-        local_name!("textarea")   => get_constructor!(HTMLTextAreaElementBinding),
-        local_name!("tfoot")      => get_constructor!(HTMLTableSectionElementBinding),
-        local_name!("th")         => get_constructor!(HTMLTableHeaderCellElementBinding),
-        local_name!("thead")      => get_constructor!(HTMLTableSectionElementBinding),
-        local_name!("time")       => get_constructor!(HTMLTimeElementBinding),
-        local_name!("title")      => get_constructor!(HTMLTitleElementBinding),
-        local_name!("tr")         => get_constructor!(HTMLTableRowElementBinding),
-        local_name!("tt")         => get_constructor!(HTMLElementBinding),
-        local_name!("track")      => get_constructor!(HTMLTrackElementBinding),
-        local_name!("u")          => get_constructor!(HTMLElementBinding),
-        local_name!("ul")         => get_constructor!(HTMLUListElementBinding),
-        local_name!("var")        => get_constructor!(HTMLElementBinding),
-        local_name!("video")      => get_constructor!(HTMLVideoElementBinding),
-        local_name!("wbr")        => get_constructor!(HTMLElementBinding),
-        local_name!("xmp")        => get_constructor!(HTMLPreElementBinding),
-        _                         => false,
-    }
-}
diff --git a/components/script/dom/bindings/mod.rs b/components/script/dom/bindings/mod.rs
index 7cd90547105..6fdf690588f 100644
--- a/components/script/dom/bindings/mod.rs
+++ b/components/script/dom/bindings/mod.rs
@@ -139,6 +139,7 @@ pub mod constant;
 pub mod conversions;
 pub mod error;
 pub mod guard;
+pub mod htmlconstructor;
 pub mod inheritance;
 pub mod interface;
 pub mod iterable;