script: Move HTML DOM interfaces to script/dom/html/ (#39046)

See #38901.

Testing: Refactor
Fixes: Partially #38901

Signed-off-by: Ashwin Naren <arihant2math@gmail.com>

components/script/body.rs

@@ -33,7 +33,7 @@ use crate::dom::bindings::trace::RootedTraceableBox;
 use crate::dom::blob::{Blob, normalize_type_string};
 use crate::dom::formdata::FormData;
 use crate::dom::globalscope::GlobalScope;
-use crate::dom::htmlformelement::{encode_multipart_form_data, generate_boundary};
+use crate::dom::html::htmlformelement::{encode_multipart_form_data, generate_boundary};
 use crate::dom::promise::Promise;
 use crate::dom::promisenativehandler::{Callback, PromiseNativeHandler};
 use crate::dom::readablestream::{ReadableStream, get_read_promise_bytes, get_read_promise_done};

components/script/canvas_context.rs

@@ -13,7 +13,7 @@ use webrender_api::ImageKey;
 
 use crate::dom::bindings::codegen::UnionTypes::HTMLCanvasElementOrOffscreenCanvas;
 use crate::dom::bindings::inheritance::Castable;
-use crate::dom::htmlcanvaselement::HTMLCanvasElement;
+use crate::dom::html::htmlcanvaselement::HTMLCanvasElement;
 use crate::dom::node::{Node, NodeDamage};
 #[cfg(feature = "webgpu")]
 use crate::dom::types::GPUCanvasContext;

components/script/canvas_state.rs

@@ -65,9 +65,9 @@ use crate::dom::dommatrix::DOMMatrix;
 use crate::dom::dommatrixreadonly::dommatrix2dinit_to_matrix;
 use crate::dom::element::Element;
 use crate::dom::globalscope::GlobalScope;
-use crate::dom::htmlcanvaselement::HTMLCanvasElement;
+use crate::dom::html::htmlcanvaselement::HTMLCanvasElement;
-use crate::dom::htmlimageelement::HTMLImageElement;
+use crate::dom::html::htmlimageelement::HTMLImageElement;
-use crate::dom::htmlvideoelement::HTMLVideoElement;
+use crate::dom::html::htmlvideoelement::HTMLVideoElement;
 use crate::dom::imagebitmap::ImageBitmap;
 use crate::dom::imagedata::ImageData;
 use crate::dom::node::{Node, NodeTraits};

components/script/devtools.rs

@@ -40,7 +40,7 @@ use crate::dom::cssstylerule::CSSStyleRule;
 use crate::dom::document::AnimationFrameCallback;
 use crate::dom::element::Element;
 use crate::dom::globalscope::GlobalScope;
-use crate::dom::htmlscriptelement::SourceCode;
+use crate::dom::html::htmlscriptelement::SourceCode;
 use crate::dom::node::{Node, NodeTraits, ShadowIncluding};
 use crate::dom::types::HTMLElement;
 use crate::realms::enter_realm;

components/script/document_collection.rs

@@ -11,7 +11,7 @@ use crate::dom::bindings::root::{Dom, DomRoot};
 use crate::dom::bindings::trace::HashMapTracedValues;
 use crate::dom::document::Document;
 use crate::dom::globalscope::GlobalScope;
-use crate::dom::htmliframeelement::HTMLIFrameElement;
+use crate::dom::html::htmliframeelement::HTMLIFrameElement;
 use crate::dom::window::Window;
 
 /// The collection of all [`Document`]s managed by the [`crate::script_thread::ScriptThread`].

components/script/dom/activation.rs

@@ -5,7 +5,7 @@
 use crate::dom::element::Element;
 use crate::dom::event::Event;
 use crate::dom::eventtarget::EventTarget;
-use crate::dom::htmlinputelement::InputActivationState;
+use crate::dom::html::htmlinputelement::InputActivationState;
 use crate::script_runtime::CanGc;
 
 /// Trait for elements with defined activation behavior

components/script/dom/audio/audiocontext.rs

@@ -28,7 +28,7 @@ use crate::dom::bindings::num::Finite;
 use crate::dom::bindings::refcounted::{Trusted, TrustedPromise};
 use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object_with_proto};
 use crate::dom::bindings::root::DomRoot;
-use crate::dom::htmlmediaelement::HTMLMediaElement;
+use crate::dom::html::htmlmediaelement::HTMLMediaElement;
 use crate::dom::mediastream::MediaStream;
 use crate::dom::mediastreamtrack::MediaStreamTrack;
 use crate::dom::promise::Promise;

components/script/dom/audio/audiotracklist.rs

@@ -13,7 +13,7 @@ use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object};
 use crate::dom::bindings::root::{Dom, DomRoot};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::eventtarget::EventTarget;
-use crate::dom::htmlmediaelement::HTMLMediaElement;
+use crate::dom::html::htmlmediaelement::HTMLMediaElement;
 use crate::dom::window::Window;
 use crate::script_runtime::CanGc;
 

components/script/dom/audio/mediaelementaudiosourcenode.rs

@@ -17,7 +17,7 @@ use crate::dom::bindings::codegen::Bindings::MediaElementAudioSourceNodeBinding:
 use crate::dom::bindings::error::Fallible;
 use crate::dom::bindings::reflector::reflect_dom_object_with_proto;
 use crate::dom::bindings::root::{Dom, DomRoot};
-use crate::dom::htmlmediaelement::HTMLMediaElement;
+use crate::dom::html::htmlmediaelement::HTMLMediaElement;
 use crate::dom::window::Window;
 use crate::script_runtime::CanGc;
 

components/script/dom/bindings/constructor.rs

@@ -49,7 +49,7 @@ use crate::dom::create::create_native_html_element;
 use crate::dom::customelementregistry::{ConstructionStackEntry, CustomElementState};
 use crate::dom::element::{Element, ElementCreator};
 use crate::dom::globalscope::GlobalScope;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::window::Window;
 use crate::script_runtime::{CanGc, JSContext, JSContext as SafeJSContext};
 

components/script/dom/bindings/trace.rs

@@ -45,8 +45,8 @@ pub(crate) use script_bindings::trace::*;
 use crate::dom::bindings::cell::DomRefCell;
 use crate::dom::bindings::refcounted::{Trusted, TrustedPromise};
 use crate::dom::bindings::reflector::DomObject;
-use crate::dom::htmlimageelement::SourceSet;
+use crate::dom::html::htmlimageelement::SourceSet;
-use crate::dom::htmlmediaelement::HTMLMediaElementFetchContext;
+use crate::dom::html::htmlmediaelement::HTMLMediaElementFetchContext;
 use crate::dom::windowproxy::WindowProxyHandler;
 use crate::script_runtime::StreamConsumer;
 use crate::script_thread::IncompleteParserContexts;

components/script/dom/canvasrenderingcontext2d.rs

@@ -31,7 +31,7 @@ use crate::dom::canvasgradient::CanvasGradient;
 use crate::dom::canvaspattern::CanvasPattern;
 use crate::dom::dommatrix::DOMMatrix;
 use crate::dom::globalscope::GlobalScope;
-use crate::dom::htmlcanvaselement::HTMLCanvasElement;
+use crate::dom::html::htmlcanvaselement::HTMLCanvasElement;
 use crate::dom::imagedata::ImageData;
 use crate::dom::node::{Node, NodeDamage, NodeTraits};
 use crate::dom::path2d::Path2D;

components/script/dom/create.rs

@@ -14,75 +14,75 @@ use crate::dom::customelementregistry::{
 use crate::dom::document::Document;
 use crate::dom::element::{CustomElementCreationMode, Element, ElementCreator};
 use crate::dom::globalscope::GlobalScope;
-use crate::dom::htmlanchorelement::HTMLAnchorElement;
+use crate::dom::html::htmlanchorelement::HTMLAnchorElement;
-use crate::dom::htmlareaelement::HTMLAreaElement;
+use crate::dom::html::htmlareaelement::HTMLAreaElement;
-use crate::dom::htmlaudioelement::HTMLAudioElement;
+use crate::dom::html::htmlaudioelement::HTMLAudioElement;
-use crate::dom::htmlbaseelement::HTMLBaseElement;
+use crate::dom::html::htmlbaseelement::HTMLBaseElement;
-use crate::dom::htmlbodyelement::HTMLBodyElement;
+use crate::dom::html::htmlbodyelement::HTMLBodyElement;
-use crate::dom::htmlbrelement::HTMLBRElement;
+use crate::dom::html::htmlbrelement::HTMLBRElement;
-use crate::dom::htmlbuttonelement::HTMLButtonElement;
+use crate::dom::html::htmlbuttonelement::HTMLButtonElement;
-use crate::dom::htmlcanvaselement::HTMLCanvasElement;
+use crate::dom::html::htmlcanvaselement::HTMLCanvasElement;
-use crate::dom::htmldataelement::HTMLDataElement;
+use crate::dom::html::htmldataelement::HTMLDataElement;
-use crate::dom::htmldatalistelement::HTMLDataListElement;
+use crate::dom::html::htmldatalistelement::HTMLDataListElement;
-use crate::dom::htmldetailselement::HTMLDetailsElement;
+use crate::dom::html::htmldetailselement::HTMLDetailsElement;
-use crate::dom::htmldialogelement::HTMLDialogElement;
+use crate::dom::html::htmldialogelement::HTMLDialogElement;
-use crate::dom::htmldirectoryelement::HTMLDirectoryElement;
+use crate::dom::html::htmldirectoryelement::HTMLDirectoryElement;
-use crate::dom::htmldivelement::HTMLDivElement;
+use crate::dom::html::htmldivelement::HTMLDivElement;
-use crate::dom::htmldlistelement::HTMLDListElement;
+use crate::dom::html::htmldlistelement::HTMLDListElement;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmlembedelement::HTMLEmbedElement;
+use crate::dom::html::htmlembedelement::HTMLEmbedElement;
-use crate::dom::htmlfieldsetelement::HTMLFieldSetElement;
+use crate::dom::html::htmlfieldsetelement::HTMLFieldSetElement;
-use crate::dom::htmlfontelement::HTMLFontElement;
+use crate::dom::html::htmlfontelement::HTMLFontElement;
-use crate::dom::htmlformelement::HTMLFormElement;
+use crate::dom::html::htmlformelement::HTMLFormElement;
-use crate::dom::htmlframeelement::HTMLFrameElement;
+use crate::dom::html::htmlframeelement::HTMLFrameElement;
-use crate::dom::htmlframesetelement::HTMLFrameSetElement;
+use crate::dom::html::htmlframesetelement::HTMLFrameSetElement;
-use crate::dom::htmlheadelement::HTMLHeadElement;
+use crate::dom::html::htmlheadelement::HTMLHeadElement;
-use crate::dom::htmlheadingelement::{HTMLHeadingElement, HeadingLevel};
+use crate::dom::html::htmlheadingelement::{HTMLHeadingElement, HeadingLevel};
-use crate::dom::htmlhrelement::HTMLHRElement;
+use crate::dom::html::htmlhrelement::HTMLHRElement;
-use crate::dom::htmlhtmlelement::HTMLHtmlElement;
+use crate::dom::html::htmlhtmlelement::HTMLHtmlElement;
-use crate::dom::htmliframeelement::HTMLIFrameElement;
+use crate::dom::html::htmliframeelement::HTMLIFrameElement;
-use crate::dom::htmlimageelement::HTMLImageElement;
+use crate::dom::html::htmlimageelement::HTMLImageElement;
-use crate::dom::htmlinputelement::HTMLInputElement;
+use crate::dom::html::htmlinputelement::HTMLInputElement;
-use crate::dom::htmllabelelement::HTMLLabelElement;
+use crate::dom::html::htmllabelelement::HTMLLabelElement;
-use crate::dom::htmllegendelement::HTMLLegendElement;
+use crate::dom::html::htmllegendelement::HTMLLegendElement;
-use crate::dom::htmllielement::HTMLLIElement;
+use crate::dom::html::htmllielement::HTMLLIElement;
-use crate::dom::htmllinkelement::HTMLLinkElement;
+use crate::dom::html::htmllinkelement::HTMLLinkElement;
-use crate::dom::htmlmapelement::HTMLMapElement;
+use crate::dom::html::htmlmapelement::HTMLMapElement;
-use crate::dom::htmlmenuelement::HTMLMenuElement;
+use crate::dom::html::htmlmenuelement::HTMLMenuElement;
-use crate::dom::htmlmetaelement::HTMLMetaElement;
+use crate::dom::html::htmlmetaelement::HTMLMetaElement;
-use crate::dom::htmlmeterelement::HTMLMeterElement;
+use crate::dom::html::htmlmeterelement::HTMLMeterElement;
-use crate::dom::htmlmodelement::HTMLModElement;
+use crate::dom::html::htmlmodelement::HTMLModElement;
-use crate::dom::htmlobjectelement::HTMLObjectElement;
+use crate::dom::html::htmlobjectelement::HTMLObjectElement;
-use crate::dom::htmlolistelement::HTMLOListElement;
+use crate::dom::html::htmlolistelement::HTMLOListElement;
-use crate::dom::htmloptgroupelement::HTMLOptGroupElement;
+use crate::dom::html::htmloptgroupelement::HTMLOptGroupElement;
-use crate::dom::htmloptionelement::HTMLOptionElement;
+use crate::dom::html::htmloptionelement::HTMLOptionElement;
-use crate::dom::htmloutputelement::HTMLOutputElement;
+use crate::dom::html::htmloutputelement::HTMLOutputElement;
-use crate::dom::htmlparagraphelement::HTMLParagraphElement;
+use crate::dom::html::htmlparagraphelement::HTMLParagraphElement;
-use crate::dom::htmlparamelement::HTMLParamElement;
+use crate::dom::html::htmlparamelement::HTMLParamElement;
-use crate::dom::htmlpictureelement::HTMLPictureElement;
+use crate::dom::html::htmlpictureelement::HTMLPictureElement;
-use crate::dom::htmlpreelement::HTMLPreElement;
+use crate::dom::html::htmlpreelement::HTMLPreElement;
-use crate::dom::htmlprogresselement::HTMLProgressElement;
+use crate::dom::html::htmlprogresselement::HTMLProgressElement;
-use crate::dom::htmlquoteelement::HTMLQuoteElement;
+use crate::dom::html::htmlquoteelement::HTMLQuoteElement;
-use crate::dom::htmlscriptelement::HTMLScriptElement;
+use crate::dom::html::htmlscriptelement::HTMLScriptElement;
-use crate::dom::htmlselectelement::HTMLSelectElement;
+use crate::dom::html::htmlselectelement::HTMLSelectElement;
-use crate::dom::htmlslotelement::HTMLSlotElement;
+use crate::dom::html::htmlslotelement::HTMLSlotElement;
-use crate::dom::htmlsourceelement::HTMLSourceElement;
+use crate::dom::html::htmlsourceelement::HTMLSourceElement;
-use crate::dom::htmlspanelement::HTMLSpanElement;
+use crate::dom::html::htmlspanelement::HTMLSpanElement;
-use crate::dom::htmlstyleelement::HTMLStyleElement;
+use crate::dom::html::htmlstyleelement::HTMLStyleElement;
-use crate::dom::htmltablecaptionelement::HTMLTableCaptionElement;
+use crate::dom::html::htmltablecaptionelement::HTMLTableCaptionElement;
-use crate::dom::htmltablecellelement::HTMLTableCellElement;
+use crate::dom::html::htmltablecellelement::HTMLTableCellElement;
-use crate::dom::htmltablecolelement::HTMLTableColElement;
+use crate::dom::html::htmltablecolelement::HTMLTableColElement;
-use crate::dom::htmltableelement::HTMLTableElement;
+use crate::dom::html::htmltableelement::HTMLTableElement;
-use crate::dom::htmltablerowelement::HTMLTableRowElement;
+use crate::dom::html::htmltablerowelement::HTMLTableRowElement;
-use crate::dom::htmltablesectionelement::HTMLTableSectionElement;
+use crate::dom::html::htmltablesectionelement::HTMLTableSectionElement;
-use crate::dom::htmltemplateelement::HTMLTemplateElement;
+use crate::dom::html::htmltemplateelement::HTMLTemplateElement;
-use crate::dom::htmltextareaelement::HTMLTextAreaElement;
+use crate::dom::html::htmltextareaelement::HTMLTextAreaElement;
-use crate::dom::htmltimeelement::HTMLTimeElement;
+use crate::dom::html::htmltimeelement::HTMLTimeElement;
-use crate::dom::htmltitleelement::HTMLTitleElement;
+use crate::dom::html::htmltitleelement::HTMLTitleElement;
-use crate::dom::htmltrackelement::HTMLTrackElement;
+use crate::dom::html::htmltrackelement::HTMLTrackElement;
-use crate::dom::htmlulistelement::HTMLUListElement;
+use crate::dom::html::htmlulistelement::HTMLUListElement;
-use crate::dom::htmlunknownelement::HTMLUnknownElement;
+use crate::dom::html::htmlunknownelement::HTMLUnknownElement;
-use crate::dom::htmlvideoelement::HTMLVideoElement;
+use crate::dom::html::htmlvideoelement::HTMLVideoElement;
 use crate::dom::svgelement::SVGElement;
 use crate::dom::svgimageelement::SVGImageElement;
 use crate::dom::svgsvgelement::SVGSVGElement;

components/script/dom/cssrulelist.rs

@@ -25,7 +25,7 @@ use crate::dom::bindings::root::{Dom, DomRoot, MutNullableDom};
 use crate::dom::csskeyframerule::CSSKeyframeRule;
 use crate::dom::cssrule::CSSRule;
 use crate::dom::cssstylesheet::CSSStyleSheet;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::window::Window;
 use crate::script_runtime::CanGc;
 use crate::stylesheet_loader::StylesheetLoader;

components/script/dom/cssstylesheet.rs

@@ -34,7 +34,7 @@ use crate::dom::bindings::str::{DOMString, USVString};
 use crate::dom::cssrulelist::{CSSRuleList, RulesSource};
 use crate::dom::document::Document;
 use crate::dom::element::Element;
-use crate::dom::htmlstyleelement::HTMLStyleElement;
+use crate::dom::html::htmlstyleelement::HTMLStyleElement;
 use crate::dom::medialist::MediaList;
 use crate::dom::node::NodeTraits;
 use crate::dom::stylesheet::StyleSheet;

components/script/dom/customelementregistry.rs

@@ -39,8 +39,8 @@ use crate::dom::document::Document;
 use crate::dom::domexception::{DOMErrorName, DOMException};
 use crate::dom::element::Element;
 use crate::dom::globalscope::GlobalScope;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmlformelement::{FormControl, HTMLFormElement};
+use crate::dom::html::htmlformelement::{FormControl, HTMLFormElement};
 use crate::dom::node::{Node, NodeTraits, ShadowIncluding};
 use crate::dom::promise::Promise;
 use crate::dom::window::Window;

components/script/dom/customstateset.rs

@@ -15,7 +15,7 @@ use style::values::AtomIdent;
 use crate::dom::bindings::cell::DomRefCell;
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::reflector::{Reflector, reflect_dom_object};
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::{Node, NodeDamage};
 use crate::dom::window::Window;
 

components/script/dom/datatransfer.rs

@@ -18,7 +18,7 @@ use crate::dom::bindings::str::DOMString;
 use crate::dom::datatransferitemlist::DataTransferItemList;
 use crate::dom::element::Element;
 use crate::dom::filelist::FileList;
-use crate::dom::htmlimageelement::HTMLImageElement;
+use crate::dom::html::htmlimageelement::HTMLImageElement;
 use crate::dom::window::Window;
 use crate::drag_data_store::{DragDataStore, Mode};
 use crate::script_runtime::{CanGc, JSContext};

components/script/dom/document.rs

@@ -143,21 +143,21 @@ use crate::dom::focusevent::FocusEvent;
 use crate::dom::fontfaceset::FontFaceSet;
 use crate::dom::globalscope::GlobalScope;
 use crate::dom::hashchangeevent::HashChangeEvent;
-use crate::dom::htmlanchorelement::HTMLAnchorElement;
+use crate::dom::html::htmlanchorelement::HTMLAnchorElement;
-use crate::dom::htmlareaelement::HTMLAreaElement;
+use crate::dom::html::htmlareaelement::HTMLAreaElement;
-use crate::dom::htmlbaseelement::HTMLBaseElement;
+use crate::dom::html::htmlbaseelement::HTMLBaseElement;
-use crate::dom::htmlcollection::{CollectionFilter, HTMLCollection};
+use crate::dom::html::htmlcollection::{CollectionFilter, HTMLCollection};
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmlembedelement::HTMLEmbedElement;
+use crate::dom::html::htmlembedelement::HTMLEmbedElement;
-use crate::dom::htmlformelement::{FormControl, FormControlElementHelpers, HTMLFormElement};
+use crate::dom::html::htmlformelement::{FormControl, FormControlElementHelpers, HTMLFormElement};
-use crate::dom::htmlheadelement::HTMLHeadElement;
+use crate::dom::html::htmlheadelement::HTMLHeadElement;
-use crate::dom::htmlhtmlelement::HTMLHtmlElement;
+use crate::dom::html::htmlhtmlelement::HTMLHtmlElement;
-use crate::dom::htmliframeelement::HTMLIFrameElement;
+use crate::dom::html::htmliframeelement::HTMLIFrameElement;
-use crate::dom::htmlimageelement::HTMLImageElement;
+use crate::dom::html::htmlimageelement::HTMLImageElement;
-use crate::dom::htmlinputelement::HTMLInputElement;
+use crate::dom::html::htmlinputelement::HTMLInputElement;
-use crate::dom::htmlscriptelement::{HTMLScriptElement, ScriptResult};
+use crate::dom::html::htmlscriptelement::{HTMLScriptElement, ScriptResult};
-use crate::dom::htmltextareaelement::HTMLTextAreaElement;
+use crate::dom::html::htmltextareaelement::HTMLTextAreaElement;
-use crate::dom::htmltitleelement::HTMLTitleElement;
+use crate::dom::html::htmltitleelement::HTMLTitleElement;
 use crate::dom::intersectionobserver::IntersectionObserver;
 use crate::dom::keyboardevent::KeyboardEvent;
 use crate::dom::location::{Location, NavigationType};

components/script/dom/documentfragment.rs

@@ -17,7 +17,7 @@ use crate::dom::bindings::root::{Dom, DomRoot};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::document::Document;
 use crate::dom::element::Element;
-use crate::dom::htmlcollection::HTMLCollection;
+use crate::dom::html::htmlcollection::HTMLCollection;
 use crate::dom::node::{Node, NodeTraits};
 use crate::dom::nodelist::NodeList;
 use crate::dom::virtualmethods::VirtualMethods;

components/script/dom/documentorshadowroot.rs

@@ -30,7 +30,7 @@ use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::num::Finite;
 use crate::dom::bindings::root::{Dom, DomRoot};
 use crate::dom::element::Element;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::{self, Node, VecPreOrderInsertionHelper};
 use crate::dom::shadowroot::ShadowRoot;
 use crate::dom::stylesheetlist::StyleSheetListOwner;

components/script/dom/domimplementation.rs

@@ -22,10 +22,10 @@ use crate::dom::bindings::root::{Dom, DomRoot};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::document::{Document, DocumentSource, HasBrowsingContext, IsHTMLDocument};
 use crate::dom::documenttype::DocumentType;
-use crate::dom::htmlbodyelement::HTMLBodyElement;
+use crate::dom::html::htmlbodyelement::HTMLBodyElement;
-use crate::dom::htmlheadelement::HTMLHeadElement;
+use crate::dom::html::htmlheadelement::HTMLHeadElement;
-use crate::dom::htmlhtmlelement::HTMLHtmlElement;
+use crate::dom::html::htmlhtmlelement::HTMLHtmlElement;
-use crate::dom::htmltitleelement::HTMLTitleElement;
+use crate::dom::html::htmltitleelement::HTMLTitleElement;
 use crate::dom::node::Node;
 use crate::dom::text::Text;
 use crate::dom::xmldocument::XMLDocument;

components/script/dom/domstringmap.rs

@@ -9,7 +9,7 @@ use crate::dom::bindings::error::ErrorResult;
 use crate::dom::bindings::reflector::{Reflector, reflect_dom_object};
 use crate::dom::bindings::root::{Dom, DomRoot};
 use crate::dom::bindings::str::DOMString;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::NodeTraits;
 use crate::script_runtime::CanGc;
 

components/script/dom/element.rs

@@ -117,38 +117,46 @@ use crate::dom::domtokenlist::DOMTokenList;
 use crate::dom::elementinternals::ElementInternals;
 use crate::dom::eventtarget::EventTarget;
 use crate::dom::globalscope::GlobalScope;
-use crate::dom::htmlanchorelement::HTMLAnchorElement;
+use crate::dom::html::htmlanchorelement::HTMLAnchorElement;
-use crate::dom::htmlbodyelement::{HTMLBodyElement, HTMLBodyElementLayoutHelpers};
+use crate::dom::html::htmlbodyelement::{HTMLBodyElement, HTMLBodyElementLayoutHelpers};
-use crate::dom::htmlbuttonelement::HTMLButtonElement;
+use crate::dom::html::htmlbuttonelement::HTMLButtonElement;
-use crate::dom::htmlcollection::HTMLCollection;
+use crate::dom::html::htmlcollection::HTMLCollection;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmlfieldsetelement::HTMLFieldSetElement;
+use crate::dom::html::htmlfieldsetelement::HTMLFieldSetElement;
-use crate::dom::htmlfontelement::{HTMLFontElement, HTMLFontElementLayoutHelpers};
+use crate::dom::html::htmlfontelement::{HTMLFontElement, HTMLFontElementLayoutHelpers};
-use crate::dom::htmlformelement::FormControlElementHelpers;
+use crate::dom::html::htmlformelement::FormControlElementHelpers;
-use crate::dom::htmlhrelement::{HTMLHRElement, HTMLHRLayoutHelpers, SizePresentationalHint};
+use crate::dom::html::htmlhrelement::{HTMLHRElement, HTMLHRLayoutHelpers, SizePresentationalHint};
-use crate::dom::htmliframeelement::{HTMLIFrameElement, HTMLIFrameElementLayoutMethods};
+use crate::dom::html::htmliframeelement::{HTMLIFrameElement, HTMLIFrameElementLayoutMethods};
-use crate::dom::htmlimageelement::{HTMLImageElement, LayoutHTMLImageElementHelpers};
+use crate::dom::html::htmlimageelement::{HTMLImageElement, LayoutHTMLImageElementHelpers};
-use crate::dom::htmlinputelement::{HTMLInputElement, LayoutHTMLInputElementHelpers};
+use crate::dom::html::htmlinputelement::{HTMLInputElement, LayoutHTMLInputElementHelpers};
-use crate::dom::htmllabelelement::HTMLLabelElement;
+use crate::dom::html::htmllabelelement::HTMLLabelElement;
-use crate::dom::htmllegendelement::HTMLLegendElement;
+use crate::dom::html::htmllegendelement::HTMLLegendElement;
-use crate::dom::htmllinkelement::HTMLLinkElement;
+use crate::dom::html::htmllinkelement::HTMLLinkElement;
-use crate::dom::htmlobjectelement::HTMLObjectElement;
+use crate::dom::html::htmlobjectelement::HTMLObjectElement;
-use crate::dom::htmloptgroupelement::HTMLOptGroupElement;
+use crate::dom::html::htmloptgroupelement::HTMLOptGroupElement;
-use crate::dom::htmloutputelement::HTMLOutputElement;
+use crate::dom::html::htmloutputelement::HTMLOutputElement;
-use crate::dom::htmlscriptelement::HTMLScriptElement;
+use crate::dom::html::htmlscriptelement::HTMLScriptElement;
-use crate::dom::htmlselectelement::HTMLSelectElement;
+use crate::dom::html::htmlselectelement::HTMLSelectElement;
-use crate::dom::htmlslotelement::{HTMLSlotElement, Slottable};
+use crate::dom::html::htmlslotelement::{HTMLSlotElement, Slottable};
-use crate::dom::htmlstyleelement::HTMLStyleElement;
+use crate::dom::html::htmlstyleelement::HTMLStyleElement;
-use crate::dom::htmltablecellelement::{HTMLTableCellElement, HTMLTableCellElementLayoutHelpers};
+use crate::dom::html::htmltablecellelement::{
-use crate::dom::htmltablecolelement::{HTMLTableColElement, HTMLTableColElementLayoutHelpers};
+    HTMLTableCellElement, HTMLTableCellElementLayoutHelpers,
-use crate::dom::htmltableelement::{HTMLTableElement, HTMLTableElementLayoutHelpers};
+};
-use crate::dom::htmltablerowelement::{HTMLTableRowElement, HTMLTableRowElementLayoutHelpers};
+use crate::dom::html::htmltablecolelement::{
-use crate::dom::htmltablesectionelement::{
+    HTMLTableColElement, HTMLTableColElementLayoutHelpers,
+};
+use crate::dom::html::htmltableelement::{HTMLTableElement, HTMLTableElementLayoutHelpers};
+use crate::dom::html::htmltablerowelement::{
+    HTMLTableRowElement, HTMLTableRowElementLayoutHelpers,
+};
+use crate::dom::html::htmltablesectionelement::{
     HTMLTableSectionElement, HTMLTableSectionElementLayoutHelpers,
 };
-use crate::dom::htmltemplateelement::HTMLTemplateElement;
+use crate::dom::html::htmltemplateelement::HTMLTemplateElement;
-use crate::dom::htmltextareaelement::{HTMLTextAreaElement, LayoutHTMLTextAreaElementHelpers};
+use crate::dom::html::htmltextareaelement::{
-use crate::dom::htmlvideoelement::{HTMLVideoElement, LayoutHTMLVideoElementHelpers};
+    HTMLTextAreaElement, LayoutHTMLTextAreaElementHelpers,
+};
+use crate::dom::html::htmlvideoelement::{HTMLVideoElement, LayoutHTMLVideoElementHelpers};
 use crate::dom::intersectionobserver::{IntersectionObserver, IntersectionObserverRegistration};
 use crate::dom::mutationobserver::{Mutation, MutationObserver};
 use crate::dom::namednodemap::NamedNodeMap;

components/script/dom/elementinternals.rs

@@ -20,8 +20,8 @@ use crate::dom::bindings::str::{DOMString, USVString};
 use crate::dom::customstateset::CustomStateSet;
 use crate::dom::element::Element;
 use crate::dom::file::File;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmlformelement::{FormDatum, FormDatumValue, HTMLFormElement};
+use crate::dom::html::htmlformelement::{FormDatum, FormDatumValue, HTMLFormElement};
 use crate::dom::node::{Node, NodeTraits};
 use crate::dom::nodelist::NodeList;
 use crate::dom::shadowroot::ShadowRoot;

components/script/dom/event.rs

@@ -31,8 +31,8 @@ use crate::dom::bindings::str::DOMString;
 use crate::dom::element::Element;
 use crate::dom::eventtarget::{EventListeners, EventTarget, ListenerPhase};
 use crate::dom::globalscope::GlobalScope;
-use crate::dom::htmlinputelement::InputActivationState;
+use crate::dom::html::htmlinputelement::InputActivationState;
-use crate::dom::htmlslotelement::HTMLSlotElement;
+use crate::dom::html::htmlslotelement::HTMLSlotElement;
 use crate::dom::mouseevent::MouseEvent;
 use crate::dom::node::{Node, NodeTraits};
 use crate::dom::shadowroot::ShadowRoot;

components/script/dom/eventtarget.rs

@@ -59,7 +59,7 @@ use crate::dom::element::Element;
 use crate::dom::errorevent::ErrorEvent;
 use crate::dom::event::{Event, EventBubbles, EventCancelable, EventComposed};
 use crate::dom::globalscope::GlobalScope;
-use crate::dom::htmlformelement::FormControlElementHelpers;
+use crate::dom::html::htmlformelement::FormControlElementHelpers;
 use crate::dom::node::{Node, NodeTraits};
 use crate::dom::shadowroot::ShadowRoot;
 use crate::dom::virtualmethods::VirtualMethods;

components/script/dom/formdata.rs

@@ -20,12 +20,12 @@ use crate::dom::bindings::str::{DOMString, USVString};
 use crate::dom::blob::Blob;
 use crate::dom::file::File;
 use crate::dom::globalscope::GlobalScope;
-use crate::dom::htmlbuttonelement::HTMLButtonElement;
+use crate::dom::html::htmlbuttonelement::HTMLButtonElement;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmlformelement::{
+use crate::dom::html::htmlformelement::{
     FormDatum, FormDatumValue, FormSubmitterElement, HTMLFormElement,
 };
-use crate::dom::htmlinputelement::HTMLInputElement;
+use crate::dom::html::htmlinputelement::HTMLInputElement;
 use crate::script_runtime::CanGc;
 
 #[dom_struct]

components/script/dom/globalscope.rs

@@ -105,7 +105,7 @@ use crate::dom::event::{Event, EventBubbles, EventCancelable};
 use crate::dom::eventsource::EventSource;
 use crate::dom::eventtarget::EventTarget;
 use crate::dom::file::File;
-use crate::dom::htmlscriptelement::{ScriptId, SourceCode};
+use crate::dom::html::htmlscriptelement::{ScriptId, SourceCode};
 use crate::dom::messageport::MessagePort;
 use crate::dom::paintworkletglobalscope::PaintWorkletGlobalScope;
 use crate::dom::performance::Performance;

components/script/dom/gpucanvascontext.rs

@@ -10,7 +10,7 @@ use crate::dom::bindings::codegen::Bindings::GPUCanvasContextBinding::GPUCanvasC
 use crate::dom::bindings::codegen::UnionTypes;
 use crate::dom::bindings::reflector::Reflector;
 use crate::dom::bindings::root::LayoutDom;
-use crate::dom::htmlcanvaselement::LayoutCanvasRenderingContextHelpers;
+use crate::dom::html::htmlcanvaselement::LayoutCanvasRenderingContextHelpers;
 
 #[dom_struct]
 pub(crate) struct GPUCanvasContext {

components/script/dom/html/htmlanchorelement.rs

@@ -27,9 +27,9 @@ use crate::dom::domtokenlist::DOMTokenList;
 use crate::dom::element::{AttributeMutation, Element, reflect_referrer_policy_attribute};
 use crate::dom::event::Event;
 use crate::dom::eventtarget::EventTarget;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmlhyperlinkelementutils::{HyperlinkElement, HyperlinkElementTraits};
+use crate::dom::html::htmlhyperlinkelementutils::{HyperlinkElement, HyperlinkElementTraits};
-use crate::dom::htmlimageelement::HTMLImageElement;
+use crate::dom::html::htmlimageelement::HTMLImageElement;
 use crate::dom::mouseevent::MouseEvent;
 use crate::dom::node::{BindContext, Node};
 use crate::dom::virtualmethods::VirtualMethods;

components/script/dom/html/htmlareaelement.rs

@@ -27,8 +27,8 @@ use crate::dom::domtokenlist::DOMTokenList;
 use crate::dom::element::{AttributeMutation, Element, reflect_referrer_policy_attribute};
 use crate::dom::event::Event;
 use crate::dom::eventtarget::EventTarget;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmlhyperlinkelementutils::{HyperlinkElement, HyperlinkElementTraits};
+use crate::dom::html::htmlhyperlinkelementutils::{HyperlinkElement, HyperlinkElementTraits};
 use crate::dom::node::{BindContext, Node};
 use crate::dom::virtualmethods::VirtualMethods;
 use crate::links::{LinkRelations, follow_hyperlink};

components/script/dom/html/htmlaudioelement.rs

@@ -15,7 +15,7 @@ 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::html::htmlmediaelement::HTMLMediaElement;
 use crate::dom::node::Node;
 use crate::dom::window::Window;
 use crate::script_runtime::CanGc;

components/script/dom/html/htmlbaseelement.rs

@@ -14,7 +14,7 @@ use crate::dom::bindings::root::DomRoot;
 use crate::dom::bindings::str::DOMString;
 use crate::dom::document::Document;
 use crate::dom::element::{AttributeMutation, Element};
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::{BindContext, Node, NodeTraits, UnbindContext};
 use crate::dom::virtualmethods::VirtualMethods;
 use crate::script_runtime::CanGc;

components/script/dom/html/htmlbodyelement.rs

@@ -19,7 +19,7 @@ use crate::dom::bindings::str::DOMString;
 use crate::dom::document::Document;
 use crate::dom::element::{AttributeMutation, Element, LayoutElementHelpers};
 use crate::dom::eventtarget::EventTarget;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::{BindContext, Node, NodeTraits};
 use crate::dom::virtualmethods::VirtualMethods;
 use crate::script_runtime::CanGc;

components/script/dom/html/htmlbrelement.rs

@@ -8,7 +8,7 @@ use js::rust::HandleObject;
 
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::document::Document;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::Node;
 use crate::script_runtime::CanGc;
 

components/script/dom/html/htmlbuttonelement.rs

@@ -20,9 +20,9 @@ use crate::dom::document::Document;
 use crate::dom::element::{AttributeMutation, Element};
 use crate::dom::event::Event;
 use crate::dom::eventtarget::EventTarget;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmlfieldsetelement::HTMLFieldSetElement;
+use crate::dom::html::htmlfieldsetelement::HTMLFieldSetElement;
-use crate::dom::htmlformelement::{
+use crate::dom::html::htmlformelement::{
     FormControl, FormDatum, FormDatumValue, FormSubmitterElement, HTMLFormElement, ResetFrom,
     SubmittedFrom,
 };

components/script/dom/html/htmlcanvaselement.rs

@@ -24,7 +24,6 @@ use servo_media::streams::MediaStreamType;
 use servo_media::streams::registry::MediaStreamId;
 use style::attr::AttrValue;
 
-use super::node::NodeDamage;
 pub(crate) use crate::canvas_context::*;
 use crate::conversions::Convert;
 use crate::dom::attr::Attr;
@@ -50,11 +49,11 @@ use crate::dom::document::Document;
 use crate::dom::element::{AttributeMutation, Element, LayoutElementHelpers};
 #[cfg(not(feature = "webgpu"))]
 use crate::dom::gpucanvascontext::GPUCanvasContext;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::imagebitmaprenderingcontext::ImageBitmapRenderingContext;
 use crate::dom::mediastream::MediaStream;
 use crate::dom::mediastreamtrack::MediaStreamTrack;
-use crate::dom::node::{Node, NodeTraits};
+use crate::dom::node::{Node, NodeDamage, NodeTraits};
 use crate::dom::offscreencanvas::OffscreenCanvas;
 use crate::dom::values::UNSIGNED_LONG_MAX;
 use crate::dom::virtualmethods::VirtualMethods;

components/script/dom/html/htmldataelement.rs

@@ -10,7 +10,7 @@ use crate::dom::bindings::codegen::Bindings::HTMLDataElementBinding::HTMLDataEle
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::bindings::str::DOMString;
 use crate::dom::document::Document;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::Node;
 use crate::script_runtime::CanGc;
 

components/script/dom/html/htmldatalistelement.rs

@@ -10,9 +10,9 @@ use crate::dom::bindings::codegen::Bindings::HTMLDataListElementBinding::HTMLDat
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::document::Document;
-use crate::dom::htmlcollection::HTMLCollection;
+use crate::dom::html::htmlcollection::HTMLCollection;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmloptionelement::HTMLOptionElement;
+use crate::dom::html::htmloptionelement::HTMLOptionElement;
 use crate::dom::node::{Node, NodeTraits};
 use crate::script_runtime::CanGc;
 

components/script/dom/html/htmldetailselement.rs

@@ -20,8 +20,8 @@ use crate::dom::bindings::root::{Dom, DomRoot};
 use crate::dom::document::Document;
 use crate::dom::element::{AttributeMutation, Element};
 use crate::dom::eventtarget::EventTarget;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmlslotelement::HTMLSlotElement;
+use crate::dom::html::htmlslotelement::HTMLSlotElement;
 use crate::dom::node::{BindContext, ChildrenMutation, Node, NodeDamage, NodeTraits};
 use crate::dom::text::Text;
 use crate::dom::virtualmethods::VirtualMethods;

components/script/dom/html/htmldialogelement.rs

@@ -14,7 +14,7 @@ use crate::dom::bindings::str::DOMString;
 use crate::dom::document::Document;
 use crate::dom::element::Element;
 use crate::dom::eventtarget::EventTarget;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::{Node, NodeTraits};
 use crate::script_runtime::CanGc;
 

components/script/dom/html/htmldirectoryelement.rs

@@ -8,7 +8,7 @@ use js::rust::HandleObject;
 
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::document::Document;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::Node;
 use crate::script_runtime::CanGc;
 

components/script/dom/html/htmldivelement.rs

@@ -10,7 +10,7 @@ use crate::dom::bindings::codegen::Bindings::HTMLDivElementBinding::HTMLDivEleme
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::bindings::str::DOMString;
 use crate::dom::document::Document;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::Node;
 use crate::script_runtime::CanGc;
 

components/script/dom/html/htmldlistelement.rs

@@ -8,7 +8,7 @@ use js::rust::HandleObject;
 
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::document::Document;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::Node;
 use crate::script_runtime::CanGc;
 

components/script/dom/html/htmldocument.rs

@@ -9,8 +9,8 @@ use script_bindings::root::DomRoot;
 use script_bindings::script_runtime::CanGc;
 use script_bindings::str::DOMString;
 
-use super::types::{Document, Location};
 use crate::dom::bindings::codegen::Bindings::DocumentBinding::NamedPropertyValue;
+use crate::dom::types::{Document, Location};
 
 /// <https://html.spec.whatwg.org/multipage/#htmldocument>
 #[dom_struct]

components/script/dom/html/htmlelement.rs

@@ -13,7 +13,6 @@ use layout_api::QueryMsg;
 use style::attr::AttrValue;
 use stylo_dom::ElementState;
 
-use super::customelementregistry::CustomElementState;
 use crate::dom::activation::Activatable;
 use crate::dom::attr::Attr;
 use crate::dom::bindings::codegen::Bindings::CharacterDataBinding::CharacterData_Binding::CharacterDataMethods;
@@ -32,7 +31,7 @@ use crate::dom::bindings::root::{Dom, DomRoot, MutNullableDom};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::characterdata::CharacterData;
 use crate::dom::cssstyledeclaration::{CSSModificationAccess, CSSStyleDeclaration, CSSStyleOwner};
-use crate::dom::customelementregistry::CallbackReaction;
+use crate::dom::customelementregistry::{CallbackReaction, CustomElementState};
 use crate::dom::document::{Document, FocusInitiator};
 use crate::dom::documentfragment::DocumentFragment;
 use crate::dom::domstringmap::DOMStringMap;
@@ -40,15 +39,15 @@ use crate::dom::element::{AttributeMutation, Element};
 use crate::dom::elementinternals::ElementInternals;
 use crate::dom::event::Event;
 use crate::dom::eventtarget::EventTarget;
-use crate::dom::htmlbodyelement::HTMLBodyElement;
+use crate::dom::html::htmlbodyelement::HTMLBodyElement;
-use crate::dom::htmlbrelement::HTMLBRElement;
+use crate::dom::html::htmlbrelement::HTMLBRElement;
-use crate::dom::htmldetailselement::HTMLDetailsElement;
+use crate::dom::html::htmldetailselement::HTMLDetailsElement;
-use crate::dom::htmlformelement::{FormControl, HTMLFormElement};
+use crate::dom::html::htmlformelement::{FormControl, HTMLFormElement};
-use crate::dom::htmlframesetelement::HTMLFrameSetElement;
+use crate::dom::html::htmlframesetelement::HTMLFrameSetElement;
-use crate::dom::htmlhtmlelement::HTMLHtmlElement;
+use crate::dom::html::htmlhtmlelement::HTMLHtmlElement;
-use crate::dom::htmlinputelement::{HTMLInputElement, InputType};
+use crate::dom::html::htmlinputelement::{HTMLInputElement, InputType};
-use crate::dom::htmllabelelement::HTMLLabelElement;
+use crate::dom::html::htmllabelelement::HTMLLabelElement;
-use crate::dom::htmltextareaelement::HTMLTextAreaElement;
+use crate::dom::html::htmltextareaelement::HTMLTextAreaElement;
 use crate::dom::node::{BindContext, Node, NodeTraits, ShadowIncluding, UnbindContext};
 use crate::dom::shadowroot::ShadowRoot;
 use crate::dom::text::Text;

components/script/dom/html/htmlembedelement.rs

@@ -8,7 +8,7 @@ use js::rust::HandleObject;
 
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::document::Document;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::Node;
 use crate::script_runtime::CanGc;
 

components/script/dom/html/htmlfieldsetelement.rs

@@ -17,10 +17,10 @@ use crate::dom::bindings::str::DOMString;
 use crate::dom::customelementregistry::CallbackReaction;
 use crate::dom::document::Document;
 use crate::dom::element::{AttributeMutation, Element};
-use crate::dom::htmlcollection::HTMLCollection;
+use crate::dom::html::htmlcollection::HTMLCollection;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmlformelement::{FormControl, HTMLFormElement};
+use crate::dom::html::htmlformelement::{FormControl, HTMLFormElement};
-use crate::dom::htmllegendelement::HTMLLegendElement;
+use crate::dom::html::htmllegendelement::HTMLLegendElement;
 use crate::dom::node::{Node, NodeTraits, ShadowIncluding};
 use crate::dom::validation::Validatable;
 use crate::dom::validitystate::ValidityState;

components/script/dom/html/htmlfontelement.rs

@@ -21,7 +21,7 @@ use crate::dom::bindings::root::{DomRoot, LayoutDom};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::document::Document;
 use crate::dom::element::{Element, LayoutElementHelpers};
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::Node;
 use crate::dom::virtualmethods::VirtualMethods;
 use crate::script_runtime::CanGc;

components/script/dom/html/htmlformcontrolscollection.rs

@@ -14,8 +14,8 @@ use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object};
 use crate::dom::bindings::root::{Dom, DomRoot};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::element::Element;
-use crate::dom::htmlcollection::{CollectionFilter, HTMLCollection};
+use crate::dom::html::htmlcollection::{CollectionFilter, HTMLCollection};
-use crate::dom::htmlformelement::HTMLFormElement;
+use crate::dom::html::htmlformelement::HTMLFormElement;
 use crate::dom::node::Node;
 use crate::dom::radionodelist::RadioNodeList;
 use crate::dom::window::Window;

components/script/dom/html/htmlformelement.rs

@@ -21,7 +21,6 @@ use style::str::split_html_space_chars;
 use stylo_atoms::Atom;
 use stylo_dom::ElementState;
 
-use super::bindings::trace::{HashMapTracedValues, NoTrace};
 use crate::body::Extractable;
 use crate::dom::attr::Attr;
 use crate::dom::bindings::cell::DomRefCell;
@@ -47,6 +46,7 @@ use crate::dom::bindings::refcounted::Trusted;
 use crate::dom::bindings::reflector::{DomGlobal, DomObject};
 use crate::dom::bindings::root::{Dom, DomOnceCell, DomRoot, MutNullableDom};
 use crate::dom::bindings::str::DOMString;
+use crate::dom::bindings::trace::{HashMapTracedValues, NoTrace};
 use crate::dom::blob::Blob;
 use crate::dom::customelementregistry::CallbackReaction;
 use crate::dom::document::Document;
@@ -57,20 +57,20 @@ use crate::dom::eventtarget::EventTarget;
 use crate::dom::file::File;
 use crate::dom::formdata::FormData;
 use crate::dom::formdataevent::FormDataEvent;
-use crate::dom::htmlbuttonelement::HTMLButtonElement;
+use crate::dom::html::htmlbuttonelement::HTMLButtonElement;
-use crate::dom::htmlcollection::CollectionFilter;
+use crate::dom::html::htmlcollection::CollectionFilter;
-use crate::dom::htmldatalistelement::HTMLDataListElement;
+use crate::dom::html::htmldatalistelement::HTMLDataListElement;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmlfieldsetelement::HTMLFieldSetElement;
+use crate::dom::html::htmlfieldsetelement::HTMLFieldSetElement;
-use crate::dom::htmlformcontrolscollection::HTMLFormControlsCollection;
+use crate::dom::html::htmlformcontrolscollection::HTMLFormControlsCollection;
-use crate::dom::htmlimageelement::HTMLImageElement;
+use crate::dom::html::htmlimageelement::HTMLImageElement;
-use crate::dom::htmlinputelement::{HTMLInputElement, InputType};
+use crate::dom::html::htmlinputelement::{HTMLInputElement, InputType};
-use crate::dom::htmllabelelement::HTMLLabelElement;
+use crate::dom::html::htmllabelelement::HTMLLabelElement;
-use crate::dom::htmllegendelement::HTMLLegendElement;
+use crate::dom::html::htmllegendelement::HTMLLegendElement;
-use crate::dom::htmlobjectelement::HTMLObjectElement;
+use crate::dom::html::htmlobjectelement::HTMLObjectElement;
-use crate::dom::htmloutputelement::HTMLOutputElement;
+use crate::dom::html::htmloutputelement::HTMLOutputElement;
-use crate::dom::htmlselectelement::HTMLSelectElement;
+use crate::dom::html::htmlselectelement::HTMLSelectElement;
-use crate::dom::htmltextareaelement::HTMLTextAreaElement;
+use crate::dom::html::htmltextareaelement::HTMLTextAreaElement;
 use crate::dom::node::{
     BindContext, Node, NodeFlags, NodeTraits, UnbindContext, VecPreOrderInsertionHelper,
 };

components/script/dom/html/htmlframeelement.rs

@@ -8,7 +8,7 @@ use js::rust::HandleObject;
 
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::document::Document;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::Node;
 use crate::script_runtime::CanGc;
 

components/script/dom/html/htmlframesetelement.rs

@@ -11,7 +11,7 @@ use crate::dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::document::Document;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::{Node, NodeTraits};
 use crate::script_runtime::CanGc;
 

components/script/dom/html/htmlheadelement.rs

@@ -12,8 +12,8 @@ use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::document::Document;
 use crate::dom::element::Element;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmlmetaelement::HTMLMetaElement;
+use crate::dom::html::htmlmetaelement::HTMLMetaElement;
 use crate::dom::node::{BindContext, Node, NodeTraits, ShadowIncluding};
 use crate::dom::userscripts::load_script;
 use crate::dom::virtualmethods::VirtualMethods;

components/script/dom/html/htmlheadingelement.rs

@@ -8,7 +8,7 @@ use js::rust::HandleObject;
 
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::document::Document;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::Node;
 use crate::script_runtime::CanGc;
 

components/script/dom/html/htmlhrelement.rs

@@ -20,7 +20,7 @@ use crate::dom::bindings::root::{DomRoot, LayoutDom};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::document::Document;
 use crate::dom::element::{Element, LayoutElementHelpers};
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::Node;
 use crate::dom::virtualmethods::VirtualMethods;
 use crate::script_runtime::CanGc;

components/script/dom/html/htmlhtmlelement.rs

@@ -9,7 +9,7 @@ use js::rust::HandleObject;
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::document::Document;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::Node;
 use crate::script_runtime::CanGc;
 

components/script/dom/html/htmliframeelement.rs

@@ -41,7 +41,7 @@ use crate::dom::element::{
 };
 use crate::dom::eventtarget::EventTarget;
 use crate::dom::globalscope::GlobalScope;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::{BindContext, Node, NodeDamage, NodeTraits, UnbindContext};
 use crate::dom::trustedhtml::TrustedHTML;
 use crate::dom::virtualmethods::VirtualMethods;

components/script/dom/html/htmlimageelement.rs

@@ -69,12 +69,12 @@ use crate::dom::element::{
 use crate::dom::event::Event;
 use crate::dom::eventtarget::EventTarget;
 use crate::dom::globalscope::GlobalScope;
-use crate::dom::htmlareaelement::HTMLAreaElement;
+use crate::dom::html::htmlareaelement::HTMLAreaElement;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmlformelement::{FormControl, HTMLFormElement};
+use crate::dom::html::htmlformelement::{FormControl, HTMLFormElement};
-use crate::dom::htmlmapelement::HTMLMapElement;
+use crate::dom::html::htmlmapelement::HTMLMapElement;
-use crate::dom::htmlpictureelement::HTMLPictureElement;
+use crate::dom::html::htmlpictureelement::HTMLPictureElement;
-use crate::dom::htmlsourceelement::HTMLSourceElement;
+use crate::dom::html::htmlsourceelement::HTMLSourceElement;
 use crate::dom::mouseevent::MouseEvent;
 use crate::dom::node::{BindContext, Node, NodeDamage, NodeTraits, ShadowIncluding, UnbindContext};
 use crate::dom::performanceresourcetiming::InitiatorType;

components/script/dom/html/htmlinputelement.rs

@@ -66,11 +66,11 @@ use crate::dom::eventtarget::EventTarget;
 use crate::dom::file::File;
 use crate::dom::filelist::{FileList, LayoutFileListHelpers};
 use crate::dom::globalscope::GlobalScope;
-use crate::dom::htmldatalistelement::HTMLDataListElement;
+use crate::dom::html::htmldatalistelement::HTMLDataListElement;
-use crate::dom::htmldivelement::HTMLDivElement;
+use crate::dom::html::htmldivelement::HTMLDivElement;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmlfieldsetelement::HTMLFieldSetElement;
+use crate::dom::html::htmlfieldsetelement::HTMLFieldSetElement;
-use crate::dom::htmlformelement::{
+use crate::dom::html::htmlformelement::{
     FormControl, FormDatum, FormDatumValue, FormSubmitterElement, HTMLFormElement, ResetFrom,
     SubmittedFrom,
 };

components/script/dom/html/htmllabelelement.rs

@@ -21,8 +21,8 @@ use crate::dom::document::Document;
 use crate::dom::element::{AttributeMutation, Element};
 use crate::dom::event::Event;
 use crate::dom::eventtarget::EventTarget;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmlformelement::{FormControl, FormControlElementHelpers, HTMLFormElement};
+use crate::dom::html::htmlformelement::{FormControl, FormControlElementHelpers, HTMLFormElement};
 use crate::dom::node::{Node, ShadowIncluding};
 use crate::dom::virtualmethods::VirtualMethods;
 use crate::script_runtime::CanGc;

components/script/dom/html/htmllegendelement.rs

@@ -12,9 +12,9 @@ use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::root::{DomRoot, MutNullableDom};
 use crate::dom::document::Document;
 use crate::dom::element::Element;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmlfieldsetelement::HTMLFieldSetElement;
+use crate::dom::html::htmlfieldsetelement::HTMLFieldSetElement;
-use crate::dom::htmlformelement::{FormControl, HTMLFormElement};
+use crate::dom::html::htmlformelement::{FormControl, HTMLFormElement};
 use crate::dom::node::{BindContext, Node, UnbindContext};
 use crate::dom::virtualmethods::VirtualMethods;
 use crate::script_runtime::CanGc;

components/script/dom/html/htmllielement.rs

@@ -12,7 +12,7 @@ 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::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::Node;
 use crate::dom::virtualmethods::VirtualMethods;
 use crate::script_runtime::CanGc;

components/script/dom/html/htmllinkelement.rs

@@ -56,7 +56,7 @@ use crate::dom::element::{
     referrer_policy_for_element, reflect_cross_origin_attribute, reflect_referrer_policy_attribute,
     set_cross_origin_attribute,
 };
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::medialist::MediaList;
 use crate::dom::node::{BindContext, Node, NodeTraits, UnbindContext};
 use crate::dom::performanceresourcetiming::InitiatorType;

components/script/dom/html/htmlmapelement.rs

@@ -9,8 +9,8 @@ use js::rust::HandleObject;
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::document::Document;
-use crate::dom::htmlareaelement::HTMLAreaElement;
+use crate::dom::html::htmlareaelement::HTMLAreaElement;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::{Node, ShadowIncluding};
 use crate::script_runtime::CanGc;
 

components/script/dom/html/htmlmediaelement.rs

@@ -79,11 +79,11 @@ use crate::dom::element::{
 use crate::dom::event::Event;
 use crate::dom::eventtarget::EventTarget;
 use crate::dom::globalscope::GlobalScope;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmlscriptelement::HTMLScriptElement;
+use crate::dom::html::htmlscriptelement::HTMLScriptElement;
-use crate::dom::htmlsourceelement::HTMLSourceElement;
+use crate::dom::html::htmlsourceelement::HTMLSourceElement;
-use crate::dom::htmlstyleelement::HTMLStyleElement;
+use crate::dom::html::htmlstyleelement::HTMLStyleElement;
-use crate::dom::htmlvideoelement::HTMLVideoElement;
+use crate::dom::html::htmlvideoelement::HTMLVideoElement;
 use crate::dom::mediaerror::MediaError;
 use crate::dom::mediafragmentparser::MediaFragmentParser;
 use crate::dom::mediastream::MediaStream;
@@ -106,10 +106,10 @@ use crate::script_runtime::CanGc;
 use crate::script_thread::ScriptThread;
 
 /// A CSS file to style the media controls.
-static MEDIA_CONTROL_CSS: &str = include_str!("../resources/media-controls.css");
+static MEDIA_CONTROL_CSS: &str = include_str!("../../resources/media-controls.css");
 
 /// A JS file to control the media controls.
-static MEDIA_CONTROL_JS: &str = include_str!("../resources/media-controls.js");
+static MEDIA_CONTROL_JS: &str = include_str!("../../resources/media-controls.js");
 
 #[derive(MallocSizeOf, PartialEq)]
 enum FrameStatus {

components/script/dom/html/htmlmenuelement.rs

@@ -9,7 +9,7 @@ use js::rust::HandleObject;
 use crate::dom::bindings::codegen::Bindings::HTMLMenuElementBinding::HTMLMenuElementMethods;
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::document::Document;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::Node;
 use crate::script_runtime::CanGc;
 

components/script/dom/html/htmlmetaelement.rs

@@ -18,8 +18,8 @@ use crate::dom::bindings::root::DomRoot;
 use crate::dom::bindings::str::DOMString;
 use crate::dom::document::{Document, determine_policy_for_token};
 use crate::dom::element::{AttributeMutation, Element};
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmlheadelement::HTMLHeadElement;
+use crate::dom::html::htmlheadelement::HTMLHeadElement;
 use crate::dom::node::{BindContext, Node, NodeTraits, UnbindContext};
 use crate::dom::virtualmethods::VirtualMethods;
 use crate::script_runtime::CanGc;

components/script/dom/html/htmlmeterelement.rs

@@ -20,8 +20,8 @@ use crate::dom::bindings::root::{Dom, DomRoot, MutNullableDom};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::document::Document;
 use crate::dom::element::{AttributeMutation, Element};
-use crate::dom::htmldivelement::HTMLDivElement;
+use crate::dom::html::htmldivelement::HTMLDivElement;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::{BindContext, ChildrenMutation, Node, NodeTraits};
 use crate::dom::nodelist::NodeList;
 use crate::dom::virtualmethods::VirtualMethods;

components/script/dom/html/htmlmodelement.rs

@@ -8,7 +8,7 @@ use js::rust::HandleObject;
 
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::document::Document;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::Node;
 use crate::script_runtime::CanGc;
 

components/script/dom/html/htmlobjectelement.rs

@@ -18,8 +18,8 @@ use crate::dom::bindings::root::{DomRoot, MutNullableDom};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::document::Document;
 use crate::dom::element::{AttributeMutation, Element};
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmlformelement::{FormControl, HTMLFormElement};
+use crate::dom::html::htmlformelement::{FormControl, HTMLFormElement};
 use crate::dom::node::{Node, NodeTraits};
 use crate::dom::validation::Validatable;
 use crate::dom::validitystate::ValidityState;

components/script/dom/html/htmlolistelement.rs

@@ -8,7 +8,7 @@ use js::rust::HandleObject;
 
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::document::Document;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::Node;
 use crate::script_runtime::CanGc;
 

components/script/dom/html/htmloptgroupelement.rs

@@ -15,9 +15,9 @@ use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::document::Document;
 use crate::dom::element::{AttributeMutation, Element};
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmloptionelement::HTMLOptionElement;
+use crate::dom::html::htmloptionelement::HTMLOptionElement;
-use crate::dom::htmlselectelement::HTMLSelectElement;
+use crate::dom::html::htmlselectelement::HTMLSelectElement;
 use crate::dom::node::{BindContext, Node, UnbindContext};
 use crate::dom::validation::Validatable;
 use crate::dom::validitystate::ValidationFlags;

components/script/dom/html/htmloptionelement.rs

@@ -24,11 +24,11 @@ use crate::dom::bindings::str::DOMString;
 use crate::dom::characterdata::CharacterData;
 use crate::dom::document::Document;
 use crate::dom::element::{AttributeMutation, CustomElementCreationMode, Element, ElementCreator};
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmlformelement::HTMLFormElement;
+use crate::dom::html::htmlformelement::HTMLFormElement;
-use crate::dom::htmloptgroupelement::HTMLOptGroupElement;
+use crate::dom::html::htmloptgroupelement::HTMLOptGroupElement;
-use crate::dom::htmlscriptelement::HTMLScriptElement;
+use crate::dom::html::htmlscriptelement::HTMLScriptElement;
-use crate::dom::htmlselectelement::HTMLSelectElement;
+use crate::dom::html::htmlselectelement::HTMLSelectElement;
 use crate::dom::node::{BindContext, ChildrenMutation, Node, ShadowIncluding, UnbindContext};
 use crate::dom::text::Text;
 use crate::dom::validation::Validatable;

components/script/dom/html/htmloptionscollection.rs

@@ -21,9 +21,9 @@ use crate::dom::bindings::reflector::reflect_dom_object;
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::bindings::str::DOMString;
 use crate::dom::element::Element;
-use crate::dom::htmlcollection::{CollectionFilter, HTMLCollection};
+use crate::dom::html::htmlcollection::{CollectionFilter, HTMLCollection};
-use crate::dom::htmloptionelement::HTMLOptionElement;
+use crate::dom::html::htmloptionelement::HTMLOptionElement;
-use crate::dom::htmlselectelement::HTMLSelectElement;
+use crate::dom::html::htmlselectelement::HTMLSelectElement;
 use crate::dom::node::{Node, NodeTraits};
 use crate::dom::window::Window;
 use crate::script_runtime::CanGc;

components/script/dom/html/htmloutputelement.rs

@@ -14,8 +14,8 @@ use crate::dom::bindings::root::{DomRoot, MutNullableDom};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::document::Document;
 use crate::dom::element::{AttributeMutation, Element};
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmlformelement::{FormControl, HTMLFormElement};
+use crate::dom::html::htmlformelement::{FormControl, HTMLFormElement};
 use crate::dom::node::{Node, NodeTraits};
 use crate::dom::nodelist::NodeList;
 use crate::dom::validation::Validatable;

components/script/dom/html/htmlparagraphelement.rs

@@ -10,7 +10,7 @@ use crate::dom::bindings::codegen::Bindings::HTMLParagraphElementBinding::HTMLPa
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::bindings::str::DOMString;
 use crate::dom::document::Document;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::Node;
 use crate::script_runtime::CanGc;
 

components/script/dom/html/htmlparamelement.rs

@@ -8,7 +8,7 @@ use js::rust::HandleObject;
 
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::document::Document;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::Node;
 use crate::script_runtime::CanGc;
 

components/script/dom/html/htmlpictureelement.rs

@@ -8,7 +8,7 @@ use js::rust::HandleObject;
 
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::document::Document;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::Node;
 use crate::script_runtime::CanGc;
 

components/script/dom/html/htmlpreelement.rs

@@ -12,7 +12,7 @@ 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::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::Node;
 use crate::dom::virtualmethods::VirtualMethods;
 use crate::script_runtime::CanGc;

components/script/dom/html/htmlprogresselement.rs

@@ -19,8 +19,8 @@ use crate::dom::bindings::root::{Dom, DomRoot, MutNullableDom};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::document::Document;
 use crate::dom::element::{AttributeMutation, Element};
-use crate::dom::htmldivelement::HTMLDivElement;
+use crate::dom::html::htmldivelement::HTMLDivElement;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::{BindContext, Node, NodeTraits};
 use crate::dom::nodelist::NodeList;
 use crate::dom::virtualmethods::VirtualMethods;

components/script/dom/html/htmlquoteelement.rs

@@ -10,7 +10,7 @@ use crate::dom::bindings::codegen::Bindings::HTMLQuoteElementBinding::HTMLQuoteE
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::bindings::str::USVString;
 use crate::dom::document::Document;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::Node;
 use crate::script_runtime::CanGc;
 

components/script/dom/html/htmlscriptelement.rs

@@ -55,7 +55,7 @@ use crate::dom::element::{
 };
 use crate::dom::event::{Event, EventBubbles, EventCancelable};
 use crate::dom::globalscope::GlobalScope;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::{ChildrenMutation, CloneChildrenFlag, Node, NodeTraits};
 use crate::dom::performanceresourcetiming::InitiatorType;
 use crate::dom::trustedscript::TrustedScript;

components/script/dom/html/htmlselectelement.rs

@@ -40,14 +40,14 @@ use crate::dom::document::Document;
 use crate::dom::element::{AttributeMutation, Element};
 use crate::dom::event::Event;
 use crate::dom::eventtarget::EventTarget;
-use crate::dom::htmlcollection::CollectionFilter;
+use crate::dom::html::htmlcollection::CollectionFilter;
-use crate::dom::htmldivelement::HTMLDivElement;
+use crate::dom::html::htmldivelement::HTMLDivElement;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmlfieldsetelement::HTMLFieldSetElement;
+use crate::dom::html::htmlfieldsetelement::HTMLFieldSetElement;
-use crate::dom::htmlformelement::{FormControl, FormDatum, FormDatumValue, HTMLFormElement};
+use crate::dom::html::htmlformelement::{FormControl, FormDatum, FormDatumValue, HTMLFormElement};
-use crate::dom::htmloptgroupelement::HTMLOptGroupElement;
+use crate::dom::html::htmloptgroupelement::HTMLOptGroupElement;
-use crate::dom::htmloptionelement::HTMLOptionElement;
+use crate::dom::html::htmloptionelement::HTMLOptionElement;
-use crate::dom::htmloptionscollection::HTMLOptionsCollection;
+use crate::dom::html::htmloptionscollection::HTMLOptionsCollection;
 use crate::dom::node::{BindContext, ChildrenMutation, Node, NodeTraits, UnbindContext};
 use crate::dom::nodelist::NodeList;
 use crate::dom::text::Text;

components/script/dom/html/htmlslotelement.rs

@@ -27,9 +27,9 @@ use crate::dom::bindings::str::DOMString;
 use crate::dom::document::Document;
 use crate::dom::element::{AttributeMutation, Element};
 use crate::dom::globalscope::GlobalScope;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::mutationobserver::MutationObserver;
-use crate::dom::node::{Node, NodeDamage, NodeTraits, ShadowIncluding};
+use crate::dom::node::{BindContext, Node, NodeDamage, NodeTraits, ShadowIncluding, UnbindContext};
 use crate::dom::virtualmethods::VirtualMethods;
 use crate::script_runtime::CanGc;
 
@@ -488,7 +488,7 @@ impl VirtualMethods for HTMLSlotElement {
         }
     }
 
-    fn bind_to_tree(&self, context: &super::node::BindContext, can_gc: CanGc) {
+    fn bind_to_tree(&self, context: &BindContext, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
             s.bind_to_tree(context, can_gc);
         }
@@ -502,7 +502,7 @@ impl VirtualMethods for HTMLSlotElement {
             .register_slot(self);
     }
 
-    fn unbind_from_tree(&self, context: &super::node::UnbindContext, can_gc: CanGc) {
+    fn unbind_from_tree(&self, context: &UnbindContext, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
             s.unbind_from_tree(context, can_gc);
         }

components/script/dom/html/htmlsourceelement.rs

@@ -14,9 +14,9 @@ use crate::dom::bindings::root::{Dom, DomRoot, Root};
 use crate::dom::bindings::str::{DOMString, USVString};
 use crate::dom::document::Document;
 use crate::dom::element::AttributeMutation;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmlimageelement::HTMLImageElement;
+use crate::dom::html::htmlimageelement::HTMLImageElement;
-use crate::dom::htmlmediaelement::HTMLMediaElement;
+use crate::dom::html::htmlmediaelement::HTMLMediaElement;
 use crate::dom::node::{BindContext, Node, UnbindContext};
 use crate::dom::virtualmethods::VirtualMethods;
 use crate::script_runtime::CanGc;

components/script/dom/html/htmlspanelement.rs

@@ -8,7 +8,7 @@ use js::rust::HandleObject;
 
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::document::Document;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::Node;
 use crate::script_runtime::CanGc;
 

components/script/dom/html/htmlstyleelement.rs

@@ -27,7 +27,7 @@ use crate::dom::cssstylesheet::CSSStyleSheet;
 use crate::dom::document::Document;
 use crate::dom::documentorshadowroot::StylesheetSource;
 use crate::dom::element::{AttributeMutation, Element, ElementCreator};
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::medialist::MediaList;
 use crate::dom::node::{BindContext, ChildrenMutation, Node, NodeTraits, UnbindContext};
 use crate::dom::stylesheet::StyleSheet as DOMStyleSheet;

components/script/dom/html/htmltablecaptionelement.rs

@@ -9,7 +9,7 @@ use js::rust::HandleObject;
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::document::Document;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::Node;
 use crate::script_runtime::CanGc;
 

components/script/dom/html/htmltablecellelement.rs

@@ -8,21 +8,19 @@ use js::rust::HandleObject;
 use style::attr::{AttrValue, LengthOrPercentageOrAuto};
 use style::color::AbsoluteColor;
 
-use super::attr::Attr;
+use crate::dom::attr::Attr;
-use super::element::AttributeMutation;
-use super::node::NodeDamage;
 use crate::dom::bindings::codegen::Bindings::HTMLTableCellElementBinding::HTMLTableCellElementMethods;
 use crate::dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::root::{DomRoot, LayoutDom};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::document::Document;
-use crate::dom::element::{Element, LayoutElementHelpers};
+use crate::dom::element::{AttributeMutation, Element, LayoutElementHelpers};
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmltableelement::HTMLTableElement;
+use crate::dom::html::htmltableelement::HTMLTableElement;
-use crate::dom::htmltablerowelement::HTMLTableRowElement;
+use crate::dom::html::htmltablerowelement::HTMLTableRowElement;
-use crate::dom::htmltablesectionelement::HTMLTableSectionElement;
+use crate::dom::html::htmltablesectionelement::HTMLTableSectionElement;
-use crate::dom::node::{LayoutNodeHelpers, Node};
+use crate::dom::node::{LayoutNodeHelpers, Node, NodeDamage};
 use crate::dom::virtualmethods::VirtualMethods;
 use crate::script_runtime::CanGc;
 

components/script/dom/html/htmltablecolelement.rs

@@ -7,18 +7,15 @@ use html5ever::{LocalName, Prefix, local_name, ns};
 use js::rust::HandleObject;
 use style::attr::{AttrValue, LengthOrPercentageOrAuto};
 
-use super::attr::Attr;
+use crate::dom::attr::Attr;
-use super::bindings::root::LayoutDom;
-use super::element::{AttributeMutation, Element};
-use super::node::NodeDamage;
 use crate::dom::bindings::codegen::Bindings::HTMLTableColElementBinding::HTMLTableColElementMethods;
 use crate::dom::bindings::inheritance::Castable;
-use crate::dom::bindings::root::DomRoot;
+use crate::dom::bindings::root::{DomRoot, LayoutDom};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::document::Document;
-use crate::dom::element::LayoutElementHelpers;
+use crate::dom::element::{AttributeMutation, Element, LayoutElementHelpers};
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::node::Node;
+use crate::dom::node::{Node, NodeDamage};
 use crate::dom::virtualmethods::VirtualMethods;
 use crate::script_runtime::CanGc;
 

components/script/dom/html/htmltableelement.rs

@@ -20,12 +20,12 @@ use crate::dom::bindings::root::{Dom, DomRoot, LayoutDom, MutNullableDom};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::document::Document;
 use crate::dom::element::{AttributeMutation, Element, LayoutElementHelpers};
-use crate::dom::htmlcollection::{CollectionFilter, HTMLCollection};
+use crate::dom::html::htmlcollection::{CollectionFilter, HTMLCollection};
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmltablecaptionelement::HTMLTableCaptionElement;
+use crate::dom::html::htmltablecaptionelement::HTMLTableCaptionElement;
-use crate::dom::htmltablecolelement::HTMLTableColElement;
+use crate::dom::html::htmltablecolelement::HTMLTableColElement;
-use crate::dom::htmltablerowelement::HTMLTableRowElement;
+use crate::dom::html::htmltablerowelement::HTMLTableRowElement;
-use crate::dom::htmltablesectionelement::HTMLTableSectionElement;
+use crate::dom::html::htmltablesectionelement::HTMLTableSectionElement;
 use crate::dom::node::{Node, NodeTraits};
 use crate::dom::virtualmethods::VirtualMethods;
 use crate::script_runtime::CanGc;

components/script/dom/html/htmltablerowelement.rs

@@ -18,11 +18,11 @@ use crate::dom::bindings::root::{DomRoot, LayoutDom, MutNullableDom};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::document::Document;
 use crate::dom::element::{Element, LayoutElementHelpers};
-use crate::dom::htmlcollection::HTMLCollection;
+use crate::dom::html::htmlcollection::HTMLCollection;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmltablecellelement::HTMLTableCellElement;
+use crate::dom::html::htmltablecellelement::HTMLTableCellElement;
-use crate::dom::htmltableelement::HTMLTableElement;
+use crate::dom::html::htmltableelement::HTMLTableElement;
-use crate::dom::htmltablesectionelement::HTMLTableSectionElement;
+use crate::dom::html::htmltablesectionelement::HTMLTableSectionElement;
 use crate::dom::node::{Node, NodeTraits};
 use crate::dom::virtualmethods::VirtualMethods;
 use crate::script_runtime::CanGc;

components/script/dom/html/htmltablesectionelement.rs

@@ -16,9 +16,9 @@ use crate::dom::bindings::root::{DomRoot, LayoutDom};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::document::Document;
 use crate::dom::element::{Element, LayoutElementHelpers};
-use crate::dom::htmlcollection::HTMLCollection;
+use crate::dom::html::htmlcollection::HTMLCollection;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmltablerowelement::HTMLTableRowElement;
+use crate::dom::html::htmltablerowelement::HTMLTableRowElement;
 use crate::dom::node::{Node, NodeTraits};
 use crate::dom::virtualmethods::VirtualMethods;
 use crate::script_runtime::CanGc;

components/script/dom/html/htmltemplateelement.rs

@@ -14,7 +14,7 @@ use crate::dom::bindings::root::{DomRoot, MutNullableDom};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::document::Document;
 use crate::dom::documentfragment::DocumentFragment;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::{CloneChildrenFlag, Node, NodeTraits};
 use crate::dom::virtualmethods::VirtualMethods;
 use crate::script_runtime::CanGc;

components/script/dom/html/htmltextareaelement.rs

@@ -28,10 +28,10 @@ use crate::dom::compositionevent::CompositionEvent;
 use crate::dom::document::Document;
 use crate::dom::element::{AttributeMutation, Element, LayoutElementHelpers};
 use crate::dom::event::{Event, EventBubbles, EventCancelable};
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
-use crate::dom::htmlfieldsetelement::HTMLFieldSetElement;
+use crate::dom::html::htmlfieldsetelement::HTMLFieldSetElement;
-use crate::dom::htmlformelement::{FormControl, HTMLFormElement};
+use crate::dom::html::htmlformelement::{FormControl, HTMLFormElement};
-use crate::dom::htmlinputelement::HTMLInputElement;
+use crate::dom::html::htmlinputelement::HTMLInputElement;
 use crate::dom::keyboardevent::KeyboardEvent;
 use crate::dom::node::{
     BindContext, ChildrenMutation, CloneChildrenFlag, Node, NodeDamage, NodeTraits, UnbindContext,

components/script/dom/html/htmltimeelement.rs

@@ -10,7 +10,7 @@ use crate::dom::bindings::codegen::Bindings::HTMLTimeElementBinding::HTMLTimeEle
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::bindings::str::DOMString;
 use crate::dom::document::Document;
-use crate::dom::htmlelement::HTMLElement;
+use crate::dom::html::htmlelement::HTMLElement;
 use crate::dom::node::Node;
 use crate::script_runtime::CanGc;