From c92cd9e62479dcc10d982ae12a45a095e66d23da Mon Sep 17 00:00:00 2001 From: Ashwin Naren Date: Sat, 30 Aug 2025 18:00:09 -0700 Subject: [PATCH] script: Move HTML DOM interfaces to `script/dom/html/` (#39046) See #38901. Testing: Refactor Fixes: Partially #38901 Signed-off-by: Ashwin Naren --- components/script/body.rs | 2 +- components/script/canvas_context.rs | 2 +- components/script/canvas_state.rs | 6 +- components/script/devtools.rs | 2 +- components/script/document_collection.rs | 2 +- components/script/dom/activation.rs | 2 +- components/script/dom/audio/audiocontext.rs | 2 +- components/script/dom/audio/audiotracklist.rs | 2 +- .../dom/audio/mediaelementaudiosourcenode.rs | 2 +- components/script/dom/bindings/constructor.rs | 2 +- components/script/dom/bindings/trace.rs | 4 +- .../script/dom/canvasrenderingcontext2d.rs | 2 +- components/script/dom/create.rs | 138 +++++++++--------- components/script/dom/cssrulelist.rs | 2 +- components/script/dom/cssstylesheet.rs | 2 +- .../script/dom/customelementregistry.rs | 4 +- components/script/dom/customstateset.rs | 2 +- components/script/dom/datatransfer.rs | 2 +- components/script/dom/document.rs | 30 ++-- components/script/dom/documentfragment.rs | 2 +- components/script/dom/documentorshadowroot.rs | 2 +- components/script/dom/domimplementation.rs | 8 +- components/script/dom/domstringmap.rs | 2 +- components/script/dom/element.rs | 68 +++++---- components/script/dom/elementinternals.rs | 4 +- components/script/dom/event.rs | 4 +- components/script/dom/eventtarget.rs | 2 +- components/script/dom/formdata.rs | 8 +- components/script/dom/globalscope.rs | 2 +- components/script/dom/gpucanvascontext.rs | 2 +- .../dom/{ => html}/htmlanchorelement.rs | 6 +- .../script/dom/{ => html}/htmlareaelement.rs | 4 +- .../script/dom/{ => html}/htmlaudioelement.rs | 2 +- .../script/dom/{ => html}/htmlbaseelement.rs | 2 +- .../script/dom/{ => html}/htmlbodyelement.rs | 2 +- .../script/dom/{ => html}/htmlbrelement.rs | 2 +- .../dom/{ => html}/htmlbuttonelement.rs | 6 +- .../dom/{ => html}/htmlcanvaselement.rs | 5 +- .../script/dom/{ => html}/htmlcollection.rs | 0 .../script/dom/{ => html}/htmldataelement.rs | 2 +- .../dom/{ => html}/htmldatalistelement.rs | 6 +- .../dom/{ => html}/htmldetailselement.rs | 4 +- .../dom/{ => html}/htmldialogelement.rs | 2 +- .../dom/{ => html}/htmldirectoryelement.rs | 2 +- .../script/dom/{ => html}/htmldivelement.rs | 2 +- .../script/dom/{ => html}/htmldlistelement.rs | 2 +- .../script/dom/{ => html}/htmldocument.rs | 2 +- .../script/dom/{ => html}/htmlelement.rs | 21 ++- .../script/dom/{ => html}/htmlembedelement.rs | 2 +- .../dom/{ => html}/htmlfieldsetelement.rs | 8 +- .../script/dom/{ => html}/htmlfontelement.rs | 2 +- .../{ => html}/htmlformcontrolscollection.rs | 4 +- .../script/dom/{ => html}/htmlformelement.rs | 30 ++-- .../script/dom/{ => html}/htmlframeelement.rs | 2 +- .../dom/{ => html}/htmlframesetelement.rs | 2 +- .../script/dom/{ => html}/htmlheadelement.rs | 4 +- .../dom/{ => html}/htmlheadingelement.rs | 2 +- .../script/dom/{ => html}/htmlhrelement.rs | 2 +- .../script/dom/{ => html}/htmlhtmlelement.rs | 2 +- .../{ => html}/htmlhyperlinkelementutils.rs | 0 .../dom/{ => html}/htmliframeelement.rs | 2 +- .../script/dom/{ => html}/htmlimageelement.rs | 12 +- .../script/dom/{ => html}/htmlinputelement.rs | 10 +- .../script/dom/{ => html}/htmllabelelement.rs | 4 +- .../dom/{ => html}/htmllegendelement.rs | 6 +- .../script/dom/{ => html}/htmllielement.rs | 2 +- .../script/dom/{ => html}/htmllinkelement.rs | 2 +- .../script/dom/{ => html}/htmlmapelement.rs | 4 +- .../script/dom/{ => html}/htmlmediaelement.rs | 14 +- .../script/dom/{ => html}/htmlmenuelement.rs | 2 +- .../script/dom/{ => html}/htmlmetaelement.rs | 4 +- .../script/dom/{ => html}/htmlmeterelement.rs | 4 +- .../script/dom/{ => html}/htmlmodelement.rs | 2 +- .../dom/{ => html}/htmlobjectelement.rs | 4 +- .../script/dom/{ => html}/htmlolistelement.rs | 2 +- .../dom/{ => html}/htmloptgroupelement.rs | 6 +- .../dom/{ => html}/htmloptionelement.rs | 10 +- .../dom/{ => html}/htmloptionscollection.rs | 6 +- .../dom/{ => html}/htmloutputelement.rs | 4 +- .../dom/{ => html}/htmlparagraphelement.rs | 2 +- .../script/dom/{ => html}/htmlparamelement.rs | 2 +- .../dom/{ => html}/htmlpictureelement.rs | 2 +- .../script/dom/{ => html}/htmlpreelement.rs | 2 +- .../dom/{ => html}/htmlprogresselement.rs | 4 +- .../script/dom/{ => html}/htmlquoteelement.rs | 2 +- .../dom/{ => html}/htmlscriptelement.rs | 2 +- .../dom/{ => html}/htmlselectelement.rs | 16 +- .../script/dom/{ => html}/htmlslotelement.rs | 8 +- .../dom/{ => html}/htmlsourceelement.rs | 6 +- .../script/dom/{ => html}/htmlspanelement.rs | 2 +- .../script/dom/{ => html}/htmlstyleelement.rs | 2 +- .../dom/{ => html}/htmltablecaptionelement.rs | 2 +- .../dom/{ => html}/htmltablecellelement.rs | 16 +- .../dom/{ => html}/htmltablecolelement.rs | 13 +- .../script/dom/{ => html}/htmltableelement.rs | 12 +- .../dom/{ => html}/htmltablerowelement.rs | 10 +- .../dom/{ => html}/htmltablesectionelement.rs | 6 +- .../dom/{ => html}/htmltemplateelement.rs | 2 +- .../dom/{ => html}/htmltextareaelement.rs | 8 +- .../script/dom/{ => html}/htmltimeelement.rs | 2 +- .../script/dom/{ => html}/htmltitleelement.rs | 2 +- .../script/dom/{ => html}/htmltrackelement.rs | 2 +- .../script/dom/{ => html}/htmlulistelement.rs | 2 +- .../dom/{ => html}/htmlunknownelement.rs | 2 +- .../script/dom/{ => html}/htmlvideoelement.rs | 2 +- components/script/dom/html/mod.rs | 81 ++++++++++ components/script/dom/macros.rs | 2 +- components/script/dom/mediasession.rs | 2 +- components/script/dom/mod.rs | 79 +--------- components/script/dom/node.rs | 26 ++-- components/script/dom/nodelist.rs | 4 +- components/script/dom/offscreencanvas.rs | 2 +- components/script/dom/radionodelist.rs | 4 +- components/script/dom/range.rs | 2 +- components/script/dom/raredata.rs | 2 +- .../script/dom/servoparser/async_html.rs | 6 +- components/script/dom/servoparser/html.rs | 4 +- components/script/dom/servoparser/mod.rs | 10 +- components/script/dom/servoparser/prefetch.rs | 2 +- components/script/dom/servoparser/xml.rs | 2 +- components/script/dom/shadowroot.rs | 2 +- components/script/dom/submitevent.rs | 2 +- components/script/dom/text.rs | 2 +- components/script/dom/userscripts.rs | 4 +- components/script/dom/validation.rs | 4 +- components/script/dom/validitystate.rs | 4 +- components/script/dom/videotracklist.rs | 2 +- components/script/dom/virtualmethods.rs | 84 +++++------ .../dom/webgl/webgl2renderingcontext.rs | 2 +- .../script/dom/webgl/webglrenderingcontext.rs | 2 +- .../script/dom/webgpu/gpucanvascontext.rs | 2 +- components/script/dom/webxr/xrmediabinding.rs | 2 +- components/script/dom/window.rs | 4 +- components/script/iframe_collection.rs | 2 +- components/script/layout_dom/element.rs | 2 +- components/script/links.rs | 8 +- components/script/microtask.rs | 4 +- components/script/script_module.rs | 2 +- components/script/script_thread.rs | 4 +- components/script/stylesheet_loader.rs | 4 +- components/script/test.rs | 12 +- components/script/webdriver_handlers.rs | 20 +-- 142 files changed, 546 insertions(+), 533 deletions(-) rename components/script/dom/{ => html}/htmlanchorelement.rs (98%) rename components/script/dom/{ => html}/htmlareaelement.rs (99%) rename components/script/dom/{ => html}/htmlaudioelement.rs (98%) rename components/script/dom/{ => html}/htmlbaseelement.rs (98%) rename components/script/dom/{ => html}/htmlbodyelement.rs (99%) rename components/script/dom/{ => html}/htmlbrelement.rs (96%) rename components/script/dom/{ => html}/htmlbuttonelement.rs (98%) rename components/script/dom/{ => html}/htmlcanvaselement.rs (99%) rename components/script/dom/{ => html}/htmlcollection.rs (100%) rename components/script/dom/{ => html}/htmldataelement.rs (97%) rename components/script/dom/{ => html}/htmldatalistelement.rs (92%) rename components/script/dom/{ => html}/htmldetailselement.rs (98%) rename components/script/dom/{ => html}/htmldialogelement.rs (98%) rename components/script/dom/{ => html}/htmldirectoryelement.rs (96%) rename components/script/dom/{ => html}/htmldivelement.rs (97%) rename components/script/dom/{ => html}/htmldlistelement.rs (96%) rename components/script/dom/{ => html}/htmldocument.rs (96%) rename components/script/dom/{ => html}/htmlelement.rs (98%) rename components/script/dom/{ => html}/htmlembedelement.rs (96%) rename components/script/dom/{ => html}/htmlfieldsetelement.rs (97%) rename components/script/dom/{ => html}/htmlfontelement.rs (99%) rename components/script/dom/{ => html}/htmlformcontrolscollection.rs (97%) rename components/script/dom/{ => html}/htmlformelement.rs (98%) rename components/script/dom/{ => html}/htmlframeelement.rs (96%) rename components/script/dom/{ => html}/htmlframesetelement.rs (97%) rename components/script/dom/{ => html}/htmlheadelement.rs (97%) rename components/script/dom/{ => html}/htmlheadingelement.rs (97%) rename components/script/dom/{ => html}/htmlhrelement.rs (99%) rename components/script/dom/{ => html}/htmlhtmlelement.rs (96%) rename components/script/dom/{ => html}/htmlhyperlinkelementutils.rs (100%) rename components/script/dom/{ => html}/htmliframeelement.rs (99%) rename components/script/dom/{ => html}/htmlimageelement.rs (99%) rename components/script/dom/{ => html}/htmlinputelement.rs (99%) rename components/script/dom/{ => html}/htmllabelelement.rs (97%) rename components/script/dom/{ => html}/htmllegendelement.rs (94%) rename components/script/dom/{ => html}/htmllielement.rs (97%) rename components/script/dom/{ => html}/htmllinkelement.rs (99%) rename components/script/dom/{ => html}/htmlmapelement.rs (93%) rename components/script/dom/{ => html}/htmlmediaelement.rs (99%) rename components/script/dom/{ => html}/htmlmenuelement.rs (97%) rename components/script/dom/{ => html}/htmlmetaelement.rs (98%) rename components/script/dom/{ => html}/htmlmeterelement.rs (99%) rename components/script/dom/{ => html}/htmlmodelement.rs (96%) rename components/script/dom/{ => html}/htmlobjectelement.rs (98%) rename components/script/dom/{ => html}/htmlolistelement.rs (96%) rename components/script/dom/{ => html}/htmloptgroupelement.rs (96%) rename components/script/dom/{ => html}/htmloptionelement.rs (98%) rename components/script/dom/{ => html}/htmloptionscollection.rs (97%) rename components/script/dom/{ => html}/htmloutputelement.rs (98%) rename components/script/dom/{ => html}/htmlparagraphelement.rs (97%) rename components/script/dom/{ => html}/htmlparamelement.rs (96%) rename components/script/dom/{ => html}/htmlpictureelement.rs (96%) rename components/script/dom/{ => html}/htmlpreelement.rs (97%) rename components/script/dom/{ => html}/htmlprogresselement.rs (98%) rename components/script/dom/{ => html}/htmlquoteelement.rs (97%) rename components/script/dom/{ => html}/htmlscriptelement.rs (99%) rename components/script/dom/{ => html}/htmlselectelement.rs (98%) rename components/script/dom/{ => html}/htmlslotelement.rs (98%) rename components/script/dom/{ => html}/htmlsourceelement.rs (96%) rename components/script/dom/{ => html}/htmlspanelement.rs (96%) rename components/script/dom/{ => html}/htmlstyleelement.rs (99%) rename components/script/dom/{ => html}/htmltablecaptionelement.rs (96%) rename components/script/dom/{ => html}/htmltablecellelement.rs (95%) rename components/script/dom/{ => html}/htmltablecolelement.rs (93%) rename components/script/dom/{ => html}/htmltableelement.rs (98%) rename components/script/dom/{ => html}/htmltablerowelement.rs (95%) rename components/script/dom/{ => html}/htmltablesectionelement.rs (96%) rename components/script/dom/{ => html}/htmltemplateelement.rs (99%) rename components/script/dom/{ => html}/htmltextareaelement.rs (99%) rename components/script/dom/{ => html}/htmltimeelement.rs (97%) rename components/script/dom/{ => html}/htmltitleelement.rs (98%) rename components/script/dom/{ => html}/htmltrackelement.rs (99%) rename components/script/dom/{ => html}/htmlulistelement.rs (97%) rename components/script/dom/{ => html}/htmlunknownelement.rs (96%) rename components/script/dom/{ => html}/htmlvideoelement.rs (99%) create mode 100644 components/script/dom/html/mod.rs diff --git a/components/script/body.rs b/components/script/body.rs index ee269fd430a..ab4ab0b42ba 100644 --- a/components/script/body.rs +++ b/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}; diff --git a/components/script/canvas_context.rs b/components/script/canvas_context.rs index f6640f98218..dd452d5488d 100644 --- a/components/script/canvas_context.rs +++ b/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; diff --git a/components/script/canvas_state.rs b/components/script/canvas_state.rs index 90ee2ed0b5f..af15f3b76cc 100644 --- a/components/script/canvas_state.rs +++ b/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::htmlimageelement::HTMLImageElement; -use crate::dom::htmlvideoelement::HTMLVideoElement; +use crate::dom::html::htmlcanvaselement::HTMLCanvasElement; +use crate::dom::html::htmlimageelement::HTMLImageElement; +use crate::dom::html::htmlvideoelement::HTMLVideoElement; use crate::dom::imagebitmap::ImageBitmap; use crate::dom::imagedata::ImageData; use crate::dom::node::{Node, NodeTraits}; diff --git a/components/script/devtools.rs b/components/script/devtools.rs index db46f725fb7..b38143da78e 100644 --- a/components/script/devtools.rs +++ b/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; diff --git a/components/script/document_collection.rs b/components/script/document_collection.rs index b9b474cfd50..511d4ac4a55 100644 --- a/components/script/document_collection.rs +++ b/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`]. diff --git a/components/script/dom/activation.rs b/components/script/dom/activation.rs index 5d9a63f45ef..1eff6f366cd 100644 --- a/components/script/dom/activation.rs +++ b/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 diff --git a/components/script/dom/audio/audiocontext.rs b/components/script/dom/audio/audiocontext.rs index 2d00441e910..15e41ff65a2 100644 --- a/components/script/dom/audio/audiocontext.rs +++ b/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; diff --git a/components/script/dom/audio/audiotracklist.rs b/components/script/dom/audio/audiotracklist.rs index 0b17b195401..fa6632f7c85 100644 --- a/components/script/dom/audio/audiotracklist.rs +++ b/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; diff --git a/components/script/dom/audio/mediaelementaudiosourcenode.rs b/components/script/dom/audio/mediaelementaudiosourcenode.rs index 656d6287dc9..12ff847e1bf 100644 --- a/components/script/dom/audio/mediaelementaudiosourcenode.rs +++ b/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; diff --git a/components/script/dom/bindings/constructor.rs b/components/script/dom/bindings/constructor.rs index ab78875b4dc..2f4ff2a5f7a 100644 --- a/components/script/dom/bindings/constructor.rs +++ b/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}; diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index 0eedf13e214..e30a9611877 100644 --- a/components/script/dom/bindings/trace.rs +++ b/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::htmlmediaelement::HTMLMediaElementFetchContext; +use crate::dom::html::htmlimageelement::SourceSet; +use crate::dom::html::htmlmediaelement::HTMLMediaElementFetchContext; use crate::dom::windowproxy::WindowProxyHandler; use crate::script_runtime::StreamConsumer; use crate::script_thread::IncompleteParserContexts; diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs index 97dad333ce5..edce3e6efb5 100644 --- a/components/script/dom/canvasrenderingcontext2d.rs +++ b/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; diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index d0d70172635..f294bf1a3e3 100644 --- a/components/script/dom/create.rs +++ b/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::htmlareaelement::HTMLAreaElement; -use crate::dom::htmlaudioelement::HTMLAudioElement; -use crate::dom::htmlbaseelement::HTMLBaseElement; -use crate::dom::htmlbodyelement::HTMLBodyElement; -use crate::dom::htmlbrelement::HTMLBRElement; -use crate::dom::htmlbuttonelement::HTMLButtonElement; -use crate::dom::htmlcanvaselement::HTMLCanvasElement; -use crate::dom::htmldataelement::HTMLDataElement; -use crate::dom::htmldatalistelement::HTMLDataListElement; -use crate::dom::htmldetailselement::HTMLDetailsElement; -use crate::dom::htmldialogelement::HTMLDialogElement; -use crate::dom::htmldirectoryelement::HTMLDirectoryElement; -use crate::dom::htmldivelement::HTMLDivElement; -use crate::dom::htmldlistelement::HTMLDListElement; -use crate::dom::htmlelement::HTMLElement; -use crate::dom::htmlembedelement::HTMLEmbedElement; -use crate::dom::htmlfieldsetelement::HTMLFieldSetElement; -use crate::dom::htmlfontelement::HTMLFontElement; -use crate::dom::htmlformelement::HTMLFormElement; -use crate::dom::htmlframeelement::HTMLFrameElement; -use crate::dom::htmlframesetelement::HTMLFrameSetElement; -use crate::dom::htmlheadelement::HTMLHeadElement; -use crate::dom::htmlheadingelement::{HTMLHeadingElement, HeadingLevel}; -use crate::dom::htmlhrelement::HTMLHRElement; -use crate::dom::htmlhtmlelement::HTMLHtmlElement; -use crate::dom::htmliframeelement::HTMLIFrameElement; -use crate::dom::htmlimageelement::HTMLImageElement; -use crate::dom::htmlinputelement::HTMLInputElement; -use crate::dom::htmllabelelement::HTMLLabelElement; -use crate::dom::htmllegendelement::HTMLLegendElement; -use crate::dom::htmllielement::HTMLLIElement; -use crate::dom::htmllinkelement::HTMLLinkElement; -use crate::dom::htmlmapelement::HTMLMapElement; -use crate::dom::htmlmenuelement::HTMLMenuElement; -use crate::dom::htmlmetaelement::HTMLMetaElement; -use crate::dom::htmlmeterelement::HTMLMeterElement; -use crate::dom::htmlmodelement::HTMLModElement; -use crate::dom::htmlobjectelement::HTMLObjectElement; -use crate::dom::htmlolistelement::HTMLOListElement; -use crate::dom::htmloptgroupelement::HTMLOptGroupElement; -use crate::dom::htmloptionelement::HTMLOptionElement; -use crate::dom::htmloutputelement::HTMLOutputElement; -use crate::dom::htmlparagraphelement::HTMLParagraphElement; -use crate::dom::htmlparamelement::HTMLParamElement; -use crate::dom::htmlpictureelement::HTMLPictureElement; -use crate::dom::htmlpreelement::HTMLPreElement; -use crate::dom::htmlprogresselement::HTMLProgressElement; -use crate::dom::htmlquoteelement::HTMLQuoteElement; -use crate::dom::htmlscriptelement::HTMLScriptElement; -use crate::dom::htmlselectelement::HTMLSelectElement; -use crate::dom::htmlslotelement::HTMLSlotElement; -use crate::dom::htmlsourceelement::HTMLSourceElement; -use crate::dom::htmlspanelement::HTMLSpanElement; -use crate::dom::htmlstyleelement::HTMLStyleElement; -use crate::dom::htmltablecaptionelement::HTMLTableCaptionElement; -use crate::dom::htmltablecellelement::HTMLTableCellElement; -use crate::dom::htmltablecolelement::HTMLTableColElement; -use crate::dom::htmltableelement::HTMLTableElement; -use crate::dom::htmltablerowelement::HTMLTableRowElement; -use crate::dom::htmltablesectionelement::HTMLTableSectionElement; -use crate::dom::htmltemplateelement::HTMLTemplateElement; -use crate::dom::htmltextareaelement::HTMLTextAreaElement; -use crate::dom::htmltimeelement::HTMLTimeElement; -use crate::dom::htmltitleelement::HTMLTitleElement; -use crate::dom::htmltrackelement::HTMLTrackElement; -use crate::dom::htmlulistelement::HTMLUListElement; -use crate::dom::htmlunknownelement::HTMLUnknownElement; -use crate::dom::htmlvideoelement::HTMLVideoElement; +use crate::dom::html::htmlanchorelement::HTMLAnchorElement; +use crate::dom::html::htmlareaelement::HTMLAreaElement; +use crate::dom::html::htmlaudioelement::HTMLAudioElement; +use crate::dom::html::htmlbaseelement::HTMLBaseElement; +use crate::dom::html::htmlbodyelement::HTMLBodyElement; +use crate::dom::html::htmlbrelement::HTMLBRElement; +use crate::dom::html::htmlbuttonelement::HTMLButtonElement; +use crate::dom::html::htmlcanvaselement::HTMLCanvasElement; +use crate::dom::html::htmldataelement::HTMLDataElement; +use crate::dom::html::htmldatalistelement::HTMLDataListElement; +use crate::dom::html::htmldetailselement::HTMLDetailsElement; +use crate::dom::html::htmldialogelement::HTMLDialogElement; +use crate::dom::html::htmldirectoryelement::HTMLDirectoryElement; +use crate::dom::html::htmldivelement::HTMLDivElement; +use crate::dom::html::htmldlistelement::HTMLDListElement; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmlembedelement::HTMLEmbedElement; +use crate::dom::html::htmlfieldsetelement::HTMLFieldSetElement; +use crate::dom::html::htmlfontelement::HTMLFontElement; +use crate::dom::html::htmlformelement::HTMLFormElement; +use crate::dom::html::htmlframeelement::HTMLFrameElement; +use crate::dom::html::htmlframesetelement::HTMLFrameSetElement; +use crate::dom::html::htmlheadelement::HTMLHeadElement; +use crate::dom::html::htmlheadingelement::{HTMLHeadingElement, HeadingLevel}; +use crate::dom::html::htmlhrelement::HTMLHRElement; +use crate::dom::html::htmlhtmlelement::HTMLHtmlElement; +use crate::dom::html::htmliframeelement::HTMLIFrameElement; +use crate::dom::html::htmlimageelement::HTMLImageElement; +use crate::dom::html::htmlinputelement::HTMLInputElement; +use crate::dom::html::htmllabelelement::HTMLLabelElement; +use crate::dom::html::htmllegendelement::HTMLLegendElement; +use crate::dom::html::htmllielement::HTMLLIElement; +use crate::dom::html::htmllinkelement::HTMLLinkElement; +use crate::dom::html::htmlmapelement::HTMLMapElement; +use crate::dom::html::htmlmenuelement::HTMLMenuElement; +use crate::dom::html::htmlmetaelement::HTMLMetaElement; +use crate::dom::html::htmlmeterelement::HTMLMeterElement; +use crate::dom::html::htmlmodelement::HTMLModElement; +use crate::dom::html::htmlobjectelement::HTMLObjectElement; +use crate::dom::html::htmlolistelement::HTMLOListElement; +use crate::dom::html::htmloptgroupelement::HTMLOptGroupElement; +use crate::dom::html::htmloptionelement::HTMLOptionElement; +use crate::dom::html::htmloutputelement::HTMLOutputElement; +use crate::dom::html::htmlparagraphelement::HTMLParagraphElement; +use crate::dom::html::htmlparamelement::HTMLParamElement; +use crate::dom::html::htmlpictureelement::HTMLPictureElement; +use crate::dom::html::htmlpreelement::HTMLPreElement; +use crate::dom::html::htmlprogresselement::HTMLProgressElement; +use crate::dom::html::htmlquoteelement::HTMLQuoteElement; +use crate::dom::html::htmlscriptelement::HTMLScriptElement; +use crate::dom::html::htmlselectelement::HTMLSelectElement; +use crate::dom::html::htmlslotelement::HTMLSlotElement; +use crate::dom::html::htmlsourceelement::HTMLSourceElement; +use crate::dom::html::htmlspanelement::HTMLSpanElement; +use crate::dom::html::htmlstyleelement::HTMLStyleElement; +use crate::dom::html::htmltablecaptionelement::HTMLTableCaptionElement; +use crate::dom::html::htmltablecellelement::HTMLTableCellElement; +use crate::dom::html::htmltablecolelement::HTMLTableColElement; +use crate::dom::html::htmltableelement::HTMLTableElement; +use crate::dom::html::htmltablerowelement::HTMLTableRowElement; +use crate::dom::html::htmltablesectionelement::HTMLTableSectionElement; +use crate::dom::html::htmltemplateelement::HTMLTemplateElement; +use crate::dom::html::htmltextareaelement::HTMLTextAreaElement; +use crate::dom::html::htmltimeelement::HTMLTimeElement; +use crate::dom::html::htmltitleelement::HTMLTitleElement; +use crate::dom::html::htmltrackelement::HTMLTrackElement; +use crate::dom::html::htmlulistelement::HTMLUListElement; +use crate::dom::html::htmlunknownelement::HTMLUnknownElement; +use crate::dom::html::htmlvideoelement::HTMLVideoElement; use crate::dom::svgelement::SVGElement; use crate::dom::svgimageelement::SVGImageElement; use crate::dom::svgsvgelement::SVGSVGElement; diff --git a/components/script/dom/cssrulelist.rs b/components/script/dom/cssrulelist.rs index 33fa4d7b556..2a6e73d84da 100644 --- a/components/script/dom/cssrulelist.rs +++ b/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; diff --git a/components/script/dom/cssstylesheet.rs b/components/script/dom/cssstylesheet.rs index 429624ae23c..a600dbbc461 100644 --- a/components/script/dom/cssstylesheet.rs +++ b/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; diff --git a/components/script/dom/customelementregistry.rs b/components/script/dom/customelementregistry.rs index a5c957f937e..d18617f7f18 100644 --- a/components/script/dom/customelementregistry.rs +++ b/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::htmlformelement::{FormControl, HTMLFormElement}; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmlformelement::{FormControl, HTMLFormElement}; use crate::dom::node::{Node, NodeTraits, ShadowIncluding}; use crate::dom::promise::Promise; use crate::dom::window::Window; diff --git a/components/script/dom/customstateset.rs b/components/script/dom/customstateset.rs index 6001be2b089..09ae7c5dd6b 100644 --- a/components/script/dom/customstateset.rs +++ b/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; diff --git a/components/script/dom/datatransfer.rs b/components/script/dom/datatransfer.rs index 73b6d4a4d43..c9fecde9bd3 100644 --- a/components/script/dom/datatransfer.rs +++ b/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}; diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 379b2f8329b..0b30786b870 100644 --- a/components/script/dom/document.rs +++ b/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::htmlareaelement::HTMLAreaElement; -use crate::dom::htmlbaseelement::HTMLBaseElement; -use crate::dom::htmlcollection::{CollectionFilter, HTMLCollection}; -use crate::dom::htmlelement::HTMLElement; -use crate::dom::htmlembedelement::HTMLEmbedElement; -use crate::dom::htmlformelement::{FormControl, FormControlElementHelpers, HTMLFormElement}; -use crate::dom::htmlheadelement::HTMLHeadElement; -use crate::dom::htmlhtmlelement::HTMLHtmlElement; -use crate::dom::htmliframeelement::HTMLIFrameElement; -use crate::dom::htmlimageelement::HTMLImageElement; -use crate::dom::htmlinputelement::HTMLInputElement; -use crate::dom::htmlscriptelement::{HTMLScriptElement, ScriptResult}; -use crate::dom::htmltextareaelement::HTMLTextAreaElement; -use crate::dom::htmltitleelement::HTMLTitleElement; +use crate::dom::html::htmlanchorelement::HTMLAnchorElement; +use crate::dom::html::htmlareaelement::HTMLAreaElement; +use crate::dom::html::htmlbaseelement::HTMLBaseElement; +use crate::dom::html::htmlcollection::{CollectionFilter, HTMLCollection}; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmlembedelement::HTMLEmbedElement; +use crate::dom::html::htmlformelement::{FormControl, FormControlElementHelpers, HTMLFormElement}; +use crate::dom::html::htmlheadelement::HTMLHeadElement; +use crate::dom::html::htmlhtmlelement::HTMLHtmlElement; +use crate::dom::html::htmliframeelement::HTMLIFrameElement; +use crate::dom::html::htmlimageelement::HTMLImageElement; +use crate::dom::html::htmlinputelement::HTMLInputElement; +use crate::dom::html::htmlscriptelement::{HTMLScriptElement, ScriptResult}; +use crate::dom::html::htmltextareaelement::HTMLTextAreaElement; +use crate::dom::html::htmltitleelement::HTMLTitleElement; use crate::dom::intersectionobserver::IntersectionObserver; use crate::dom::keyboardevent::KeyboardEvent; use crate::dom::location::{Location, NavigationType}; diff --git a/components/script/dom/documentfragment.rs b/components/script/dom/documentfragment.rs index 1be80d16f39..b2b89e3c793 100644 --- a/components/script/dom/documentfragment.rs +++ b/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; diff --git a/components/script/dom/documentorshadowroot.rs b/components/script/dom/documentorshadowroot.rs index db51cb8e713..7678c4d217c 100644 --- a/components/script/dom/documentorshadowroot.rs +++ b/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; diff --git a/components/script/dom/domimplementation.rs b/components/script/dom/domimplementation.rs index 17b864bc219..dbab1f682ba 100644 --- a/components/script/dom/domimplementation.rs +++ b/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::htmlheadelement::HTMLHeadElement; -use crate::dom::htmlhtmlelement::HTMLHtmlElement; -use crate::dom::htmltitleelement::HTMLTitleElement; +use crate::dom::html::htmlbodyelement::HTMLBodyElement; +use crate::dom::html::htmlheadelement::HTMLHeadElement; +use crate::dom::html::htmlhtmlelement::HTMLHtmlElement; +use crate::dom::html::htmltitleelement::HTMLTitleElement; use crate::dom::node::Node; use crate::dom::text::Text; use crate::dom::xmldocument::XMLDocument; diff --git a/components/script/dom/domstringmap.rs b/components/script/dom/domstringmap.rs index 5c89bc7c1a9..a47fe7b027b 100644 --- a/components/script/dom/domstringmap.rs +++ b/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; diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index a10eb558273..8560ebccee6 100644 --- a/components/script/dom/element.rs +++ b/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::htmlbodyelement::{HTMLBodyElement, HTMLBodyElementLayoutHelpers}; -use crate::dom::htmlbuttonelement::HTMLButtonElement; -use crate::dom::htmlcollection::HTMLCollection; -use crate::dom::htmlelement::HTMLElement; -use crate::dom::htmlfieldsetelement::HTMLFieldSetElement; -use crate::dom::htmlfontelement::{HTMLFontElement, HTMLFontElementLayoutHelpers}; -use crate::dom::htmlformelement::FormControlElementHelpers; -use crate::dom::htmlhrelement::{HTMLHRElement, HTMLHRLayoutHelpers, SizePresentationalHint}; -use crate::dom::htmliframeelement::{HTMLIFrameElement, HTMLIFrameElementLayoutMethods}; -use crate::dom::htmlimageelement::{HTMLImageElement, LayoutHTMLImageElementHelpers}; -use crate::dom::htmlinputelement::{HTMLInputElement, LayoutHTMLInputElementHelpers}; -use crate::dom::htmllabelelement::HTMLLabelElement; -use crate::dom::htmllegendelement::HTMLLegendElement; -use crate::dom::htmllinkelement::HTMLLinkElement; -use crate::dom::htmlobjectelement::HTMLObjectElement; -use crate::dom::htmloptgroupelement::HTMLOptGroupElement; -use crate::dom::htmloutputelement::HTMLOutputElement; -use crate::dom::htmlscriptelement::HTMLScriptElement; -use crate::dom::htmlselectelement::HTMLSelectElement; -use crate::dom::htmlslotelement::{HTMLSlotElement, Slottable}; -use crate::dom::htmlstyleelement::HTMLStyleElement; -use crate::dom::htmltablecellelement::{HTMLTableCellElement, HTMLTableCellElementLayoutHelpers}; -use crate::dom::htmltablecolelement::{HTMLTableColElement, HTMLTableColElementLayoutHelpers}; -use crate::dom::htmltableelement::{HTMLTableElement, HTMLTableElementLayoutHelpers}; -use crate::dom::htmltablerowelement::{HTMLTableRowElement, HTMLTableRowElementLayoutHelpers}; -use crate::dom::htmltablesectionelement::{ +use crate::dom::html::htmlanchorelement::HTMLAnchorElement; +use crate::dom::html::htmlbodyelement::{HTMLBodyElement, HTMLBodyElementLayoutHelpers}; +use crate::dom::html::htmlbuttonelement::HTMLButtonElement; +use crate::dom::html::htmlcollection::HTMLCollection; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmlfieldsetelement::HTMLFieldSetElement; +use crate::dom::html::htmlfontelement::{HTMLFontElement, HTMLFontElementLayoutHelpers}; +use crate::dom::html::htmlformelement::FormControlElementHelpers; +use crate::dom::html::htmlhrelement::{HTMLHRElement, HTMLHRLayoutHelpers, SizePresentationalHint}; +use crate::dom::html::htmliframeelement::{HTMLIFrameElement, HTMLIFrameElementLayoutMethods}; +use crate::dom::html::htmlimageelement::{HTMLImageElement, LayoutHTMLImageElementHelpers}; +use crate::dom::html::htmlinputelement::{HTMLInputElement, LayoutHTMLInputElementHelpers}; +use crate::dom::html::htmllabelelement::HTMLLabelElement; +use crate::dom::html::htmllegendelement::HTMLLegendElement; +use crate::dom::html::htmllinkelement::HTMLLinkElement; +use crate::dom::html::htmlobjectelement::HTMLObjectElement; +use crate::dom::html::htmloptgroupelement::HTMLOptGroupElement; +use crate::dom::html::htmloutputelement::HTMLOutputElement; +use crate::dom::html::htmlscriptelement::HTMLScriptElement; +use crate::dom::html::htmlselectelement::HTMLSelectElement; +use crate::dom::html::htmlslotelement::{HTMLSlotElement, Slottable}; +use crate::dom::html::htmlstyleelement::HTMLStyleElement; +use crate::dom::html::htmltablecellelement::{ + HTMLTableCellElement, HTMLTableCellElementLayoutHelpers, +}; +use crate::dom::html::htmltablecolelement::{ + 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::htmltextareaelement::{HTMLTextAreaElement, LayoutHTMLTextAreaElementHelpers}; -use crate::dom::htmlvideoelement::{HTMLVideoElement, LayoutHTMLVideoElementHelpers}; +use crate::dom::html::htmltemplateelement::HTMLTemplateElement; +use crate::dom::html::htmltextareaelement::{ + 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; diff --git a/components/script/dom/elementinternals.rs b/components/script/dom/elementinternals.rs index d0fd6ba4663..d4346a28524 100644 --- a/components/script/dom/elementinternals.rs +++ b/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::htmlformelement::{FormDatum, FormDatumValue, HTMLFormElement}; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmlformelement::{FormDatum, FormDatumValue, HTMLFormElement}; use crate::dom::node::{Node, NodeTraits}; use crate::dom::nodelist::NodeList; use crate::dom::shadowroot::ShadowRoot; diff --git a/components/script/dom/event.rs b/components/script/dom/event.rs index 03844d810f7..627d99b5146 100644 --- a/components/script/dom/event.rs +++ b/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::htmlslotelement::HTMLSlotElement; +use crate::dom::html::htmlinputelement::InputActivationState; +use crate::dom::html::htmlslotelement::HTMLSlotElement; use crate::dom::mouseevent::MouseEvent; use crate::dom::node::{Node, NodeTraits}; use crate::dom::shadowroot::ShadowRoot; diff --git a/components/script/dom/eventtarget.rs b/components/script/dom/eventtarget.rs index 84cd3568f12..b35c1bf6a58 100644 --- a/components/script/dom/eventtarget.rs +++ b/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; diff --git a/components/script/dom/formdata.rs b/components/script/dom/formdata.rs index 7703ecb0e76..a9cdcb89fc9 100644 --- a/components/script/dom/formdata.rs +++ b/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::htmlelement::HTMLElement; -use crate::dom::htmlformelement::{ +use crate::dom::html::htmlbuttonelement::HTMLButtonElement; +use crate::dom::html::htmlelement::HTMLElement; +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] diff --git a/components/script/dom/globalscope.rs b/components/script/dom/globalscope.rs index 5a91bba7046..a07eab246a5 100644 --- a/components/script/dom/globalscope.rs +++ b/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; diff --git a/components/script/dom/gpucanvascontext.rs b/components/script/dom/gpucanvascontext.rs index 3aa4f3fea3b..312b7e119fa 100644 --- a/components/script/dom/gpucanvascontext.rs +++ b/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 { diff --git a/components/script/dom/htmlanchorelement.rs b/components/script/dom/html/htmlanchorelement.rs similarity index 98% rename from components/script/dom/htmlanchorelement.rs rename to components/script/dom/html/htmlanchorelement.rs index b721d7579c3..b22f4b71b57 100644 --- a/components/script/dom/htmlanchorelement.rs +++ b/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::htmlhyperlinkelementutils::{HyperlinkElement, HyperlinkElementTraits}; -use crate::dom::htmlimageelement::HTMLImageElement; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmlhyperlinkelementutils::{HyperlinkElement, HyperlinkElementTraits}; +use crate::dom::html::htmlimageelement::HTMLImageElement; use crate::dom::mouseevent::MouseEvent; use crate::dom::node::{BindContext, Node}; use crate::dom::virtualmethods::VirtualMethods; diff --git a/components/script/dom/htmlareaelement.rs b/components/script/dom/html/htmlareaelement.rs similarity index 99% rename from components/script/dom/htmlareaelement.rs rename to components/script/dom/html/htmlareaelement.rs index 535d296a29f..63769f05fb1 100644 --- a/components/script/dom/htmlareaelement.rs +++ b/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::htmlhyperlinkelementutils::{HyperlinkElement, HyperlinkElementTraits}; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmlhyperlinkelementutils::{HyperlinkElement, HyperlinkElementTraits}; use crate::dom::node::{BindContext, Node}; use crate::dom::virtualmethods::VirtualMethods; use crate::links::{LinkRelations, follow_hyperlink}; diff --git a/components/script/dom/htmlaudioelement.rs b/components/script/dom/html/htmlaudioelement.rs similarity index 98% rename from components/script/dom/htmlaudioelement.rs rename to components/script/dom/html/htmlaudioelement.rs index b5c89cdde7b..a53337188d3 100644 --- a/components/script/dom/htmlaudioelement.rs +++ b/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; diff --git a/components/script/dom/htmlbaseelement.rs b/components/script/dom/html/htmlbaseelement.rs similarity index 98% rename from components/script/dom/htmlbaseelement.rs rename to components/script/dom/html/htmlbaseelement.rs index 9f263e1056c..d339b137de9 100644 --- a/components/script/dom/htmlbaseelement.rs +++ b/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; diff --git a/components/script/dom/htmlbodyelement.rs b/components/script/dom/html/htmlbodyelement.rs similarity index 99% rename from components/script/dom/htmlbodyelement.rs rename to components/script/dom/html/htmlbodyelement.rs index 5c7e59b326f..5a33d53ab0f 100644 --- a/components/script/dom/htmlbodyelement.rs +++ b/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; diff --git a/components/script/dom/htmlbrelement.rs b/components/script/dom/html/htmlbrelement.rs similarity index 96% rename from components/script/dom/htmlbrelement.rs rename to components/script/dom/html/htmlbrelement.rs index 2d5167b115b..8df1c8f73a7 100644 --- a/components/script/dom/htmlbrelement.rs +++ b/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; diff --git a/components/script/dom/htmlbuttonelement.rs b/components/script/dom/html/htmlbuttonelement.rs similarity index 98% rename from components/script/dom/htmlbuttonelement.rs rename to components/script/dom/html/htmlbuttonelement.rs index 9f9582a0fe7..4e0e20ce3b2 100644 --- a/components/script/dom/htmlbuttonelement.rs +++ b/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::htmlfieldsetelement::HTMLFieldSetElement; -use crate::dom::htmlformelement::{ +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmlfieldsetelement::HTMLFieldSetElement; +use crate::dom::html::htmlformelement::{ FormControl, FormDatum, FormDatumValue, FormSubmitterElement, HTMLFormElement, ResetFrom, SubmittedFrom, }; diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/html/htmlcanvaselement.rs similarity index 99% rename from components/script/dom/htmlcanvaselement.rs rename to components/script/dom/html/htmlcanvaselement.rs index a913bce6dc2..52f1fc7c81c 100644 --- a/components/script/dom/htmlcanvaselement.rs +++ b/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; diff --git a/components/script/dom/htmlcollection.rs b/components/script/dom/html/htmlcollection.rs similarity index 100% rename from components/script/dom/htmlcollection.rs rename to components/script/dom/html/htmlcollection.rs diff --git a/components/script/dom/htmldataelement.rs b/components/script/dom/html/htmldataelement.rs similarity index 97% rename from components/script/dom/htmldataelement.rs rename to components/script/dom/html/htmldataelement.rs index 260b3e53ea3..bb191b070fb 100644 --- a/components/script/dom/htmldataelement.rs +++ b/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; diff --git a/components/script/dom/htmldatalistelement.rs b/components/script/dom/html/htmldatalistelement.rs similarity index 92% rename from components/script/dom/htmldatalistelement.rs rename to components/script/dom/html/htmldatalistelement.rs index 9530ab90be9..e2c29c8d37a 100644 --- a/components/script/dom/htmldatalistelement.rs +++ b/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::htmlelement::HTMLElement; -use crate::dom::htmloptionelement::HTMLOptionElement; +use crate::dom::html::htmlcollection::HTMLCollection; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmloptionelement::HTMLOptionElement; use crate::dom::node::{Node, NodeTraits}; use crate::script_runtime::CanGc; diff --git a/components/script/dom/htmldetailselement.rs b/components/script/dom/html/htmldetailselement.rs similarity index 98% rename from components/script/dom/htmldetailselement.rs rename to components/script/dom/html/htmldetailselement.rs index 703c37f28b1..9e01a6ed16b 100644 --- a/components/script/dom/htmldetailselement.rs +++ b/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::htmlslotelement::HTMLSlotElement; +use crate::dom::html::htmlelement::HTMLElement; +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; diff --git a/components/script/dom/htmldialogelement.rs b/components/script/dom/html/htmldialogelement.rs similarity index 98% rename from components/script/dom/htmldialogelement.rs rename to components/script/dom/html/htmldialogelement.rs index fbd84e4efd3..b0ed1f61510 100644 --- a/components/script/dom/htmldialogelement.rs +++ b/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; diff --git a/components/script/dom/htmldirectoryelement.rs b/components/script/dom/html/htmldirectoryelement.rs similarity index 96% rename from components/script/dom/htmldirectoryelement.rs rename to components/script/dom/html/htmldirectoryelement.rs index 6e09069ad19..f1d0ea13b74 100644 --- a/components/script/dom/htmldirectoryelement.rs +++ b/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; diff --git a/components/script/dom/htmldivelement.rs b/components/script/dom/html/htmldivelement.rs similarity index 97% rename from components/script/dom/htmldivelement.rs rename to components/script/dom/html/htmldivelement.rs index 0582ff4b629..34a3d6f5507 100644 --- a/components/script/dom/htmldivelement.rs +++ b/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; diff --git a/components/script/dom/htmldlistelement.rs b/components/script/dom/html/htmldlistelement.rs similarity index 96% rename from components/script/dom/htmldlistelement.rs rename to components/script/dom/html/htmldlistelement.rs index 4198b840f27..823b72426ff 100644 --- a/components/script/dom/htmldlistelement.rs +++ b/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; diff --git a/components/script/dom/htmldocument.rs b/components/script/dom/html/htmldocument.rs similarity index 96% rename from components/script/dom/htmldocument.rs rename to components/script/dom/html/htmldocument.rs index 0aa1813b61b..2d9f2f1f309 100644 --- a/components/script/dom/htmldocument.rs +++ b/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}; /// #[dom_struct] diff --git a/components/script/dom/htmlelement.rs b/components/script/dom/html/htmlelement.rs similarity index 98% rename from components/script/dom/htmlelement.rs rename to components/script/dom/html/htmlelement.rs index 4f09f82345e..4a2372bd47e 100644 --- a/components/script/dom/htmlelement.rs +++ b/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::htmlbrelement::HTMLBRElement; -use crate::dom::htmldetailselement::HTMLDetailsElement; -use crate::dom::htmlformelement::{FormControl, HTMLFormElement}; -use crate::dom::htmlframesetelement::HTMLFrameSetElement; -use crate::dom::htmlhtmlelement::HTMLHtmlElement; -use crate::dom::htmlinputelement::{HTMLInputElement, InputType}; -use crate::dom::htmllabelelement::HTMLLabelElement; -use crate::dom::htmltextareaelement::HTMLTextAreaElement; +use crate::dom::html::htmlbodyelement::HTMLBodyElement; +use crate::dom::html::htmlbrelement::HTMLBRElement; +use crate::dom::html::htmldetailselement::HTMLDetailsElement; +use crate::dom::html::htmlformelement::{FormControl, HTMLFormElement}; +use crate::dom::html::htmlframesetelement::HTMLFrameSetElement; +use crate::dom::html::htmlhtmlelement::HTMLHtmlElement; +use crate::dom::html::htmlinputelement::{HTMLInputElement, InputType}; +use crate::dom::html::htmllabelelement::HTMLLabelElement; +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; diff --git a/components/script/dom/htmlembedelement.rs b/components/script/dom/html/htmlembedelement.rs similarity index 96% rename from components/script/dom/htmlembedelement.rs rename to components/script/dom/html/htmlembedelement.rs index 3d822d067c1..cf97405bc4b 100644 --- a/components/script/dom/htmlembedelement.rs +++ b/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; diff --git a/components/script/dom/htmlfieldsetelement.rs b/components/script/dom/html/htmlfieldsetelement.rs similarity index 97% rename from components/script/dom/htmlfieldsetelement.rs rename to components/script/dom/html/htmlfieldsetelement.rs index d5ad5fb08f6..3e1d93a9d55 100644 --- a/components/script/dom/htmlfieldsetelement.rs +++ b/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::htmlelement::HTMLElement; -use crate::dom::htmlformelement::{FormControl, HTMLFormElement}; -use crate::dom::htmllegendelement::HTMLLegendElement; +use crate::dom::html::htmlcollection::HTMLCollection; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmlformelement::{FormControl, HTMLFormElement}; +use crate::dom::html::htmllegendelement::HTMLLegendElement; use crate::dom::node::{Node, NodeTraits, ShadowIncluding}; use crate::dom::validation::Validatable; use crate::dom::validitystate::ValidityState; diff --git a/components/script/dom/htmlfontelement.rs b/components/script/dom/html/htmlfontelement.rs similarity index 99% rename from components/script/dom/htmlfontelement.rs rename to components/script/dom/html/htmlfontelement.rs index fb02a10a4e4..cd591420ec6 100644 --- a/components/script/dom/htmlfontelement.rs +++ b/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; diff --git a/components/script/dom/htmlformcontrolscollection.rs b/components/script/dom/html/htmlformcontrolscollection.rs similarity index 97% rename from components/script/dom/htmlformcontrolscollection.rs rename to components/script/dom/html/htmlformcontrolscollection.rs index c5745d60f70..cfcc4be141c 100644 --- a/components/script/dom/htmlformcontrolscollection.rs +++ b/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::htmlformelement::HTMLFormElement; +use crate::dom::html::htmlcollection::{CollectionFilter, HTMLCollection}; +use crate::dom::html::htmlformelement::HTMLFormElement; use crate::dom::node::Node; use crate::dom::radionodelist::RadioNodeList; use crate::dom::window::Window; diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/html/htmlformelement.rs similarity index 98% rename from components/script/dom/htmlformelement.rs rename to components/script/dom/html/htmlformelement.rs index 12c1ddc5767..765d63497cd 100644 --- a/components/script/dom/htmlformelement.rs +++ b/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::htmlcollection::CollectionFilter; -use crate::dom::htmldatalistelement::HTMLDataListElement; -use crate::dom::htmlelement::HTMLElement; -use crate::dom::htmlfieldsetelement::HTMLFieldSetElement; -use crate::dom::htmlformcontrolscollection::HTMLFormControlsCollection; -use crate::dom::htmlimageelement::HTMLImageElement; -use crate::dom::htmlinputelement::{HTMLInputElement, InputType}; -use crate::dom::htmllabelelement::HTMLLabelElement; -use crate::dom::htmllegendelement::HTMLLegendElement; -use crate::dom::htmlobjectelement::HTMLObjectElement; -use crate::dom::htmloutputelement::HTMLOutputElement; -use crate::dom::htmlselectelement::HTMLSelectElement; -use crate::dom::htmltextareaelement::HTMLTextAreaElement; +use crate::dom::html::htmlbuttonelement::HTMLButtonElement; +use crate::dom::html::htmlcollection::CollectionFilter; +use crate::dom::html::htmldatalistelement::HTMLDataListElement; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmlfieldsetelement::HTMLFieldSetElement; +use crate::dom::html::htmlformcontrolscollection::HTMLFormControlsCollection; +use crate::dom::html::htmlimageelement::HTMLImageElement; +use crate::dom::html::htmlinputelement::{HTMLInputElement, InputType}; +use crate::dom::html::htmllabelelement::HTMLLabelElement; +use crate::dom::html::htmllegendelement::HTMLLegendElement; +use crate::dom::html::htmlobjectelement::HTMLObjectElement; +use crate::dom::html::htmloutputelement::HTMLOutputElement; +use crate::dom::html::htmlselectelement::HTMLSelectElement; +use crate::dom::html::htmltextareaelement::HTMLTextAreaElement; use crate::dom::node::{ BindContext, Node, NodeFlags, NodeTraits, UnbindContext, VecPreOrderInsertionHelper, }; diff --git a/components/script/dom/htmlframeelement.rs b/components/script/dom/html/htmlframeelement.rs similarity index 96% rename from components/script/dom/htmlframeelement.rs rename to components/script/dom/html/htmlframeelement.rs index 3bebcf677ca..cd0123b410b 100644 --- a/components/script/dom/htmlframeelement.rs +++ b/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; diff --git a/components/script/dom/htmlframesetelement.rs b/components/script/dom/html/htmlframesetelement.rs similarity index 97% rename from components/script/dom/htmlframesetelement.rs rename to components/script/dom/html/htmlframesetelement.rs index 9ec694ba6af..52e027c1a9a 100644 --- a/components/script/dom/htmlframesetelement.rs +++ b/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; diff --git a/components/script/dom/htmlheadelement.rs b/components/script/dom/html/htmlheadelement.rs similarity index 97% rename from components/script/dom/htmlheadelement.rs rename to components/script/dom/html/htmlheadelement.rs index 7b2d715318f..842e8bb6da6 100644 --- a/components/script/dom/htmlheadelement.rs +++ b/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::htmlmetaelement::HTMLMetaElement; +use crate::dom::html::htmlelement::HTMLElement; +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; diff --git a/components/script/dom/htmlheadingelement.rs b/components/script/dom/html/htmlheadingelement.rs similarity index 97% rename from components/script/dom/htmlheadingelement.rs rename to components/script/dom/html/htmlheadingelement.rs index a26f57d44a0..4ab3511f7f9 100644 --- a/components/script/dom/htmlheadingelement.rs +++ b/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; diff --git a/components/script/dom/htmlhrelement.rs b/components/script/dom/html/htmlhrelement.rs similarity index 99% rename from components/script/dom/htmlhrelement.rs rename to components/script/dom/html/htmlhrelement.rs index 8dc11e4e848..869ccb82ea8 100644 --- a/components/script/dom/htmlhrelement.rs +++ b/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; diff --git a/components/script/dom/htmlhtmlelement.rs b/components/script/dom/html/htmlhtmlelement.rs similarity index 96% rename from components/script/dom/htmlhtmlelement.rs rename to components/script/dom/html/htmlhtmlelement.rs index fe4e4c828d8..2360884afdb 100644 --- a/components/script/dom/htmlhtmlelement.rs +++ b/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; diff --git a/components/script/dom/htmlhyperlinkelementutils.rs b/components/script/dom/html/htmlhyperlinkelementutils.rs similarity index 100% rename from components/script/dom/htmlhyperlinkelementutils.rs rename to components/script/dom/html/htmlhyperlinkelementutils.rs diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/html/htmliframeelement.rs similarity index 99% rename from components/script/dom/htmliframeelement.rs rename to components/script/dom/html/htmliframeelement.rs index e675668d655..6fd89ac8085 100644 --- a/components/script/dom/htmliframeelement.rs +++ b/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; diff --git a/components/script/dom/htmlimageelement.rs b/components/script/dom/html/htmlimageelement.rs similarity index 99% rename from components/script/dom/htmlimageelement.rs rename to components/script/dom/html/htmlimageelement.rs index 2c25e621ea2..9e96ba7c95b 100644 --- a/components/script/dom/htmlimageelement.rs +++ b/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::htmlelement::HTMLElement; -use crate::dom::htmlformelement::{FormControl, HTMLFormElement}; -use crate::dom::htmlmapelement::HTMLMapElement; -use crate::dom::htmlpictureelement::HTMLPictureElement; -use crate::dom::htmlsourceelement::HTMLSourceElement; +use crate::dom::html::htmlareaelement::HTMLAreaElement; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmlformelement::{FormControl, HTMLFormElement}; +use crate::dom::html::htmlmapelement::HTMLMapElement; +use crate::dom::html::htmlpictureelement::HTMLPictureElement; +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; diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/html/htmlinputelement.rs similarity index 99% rename from components/script/dom/htmlinputelement.rs rename to components/script/dom/html/htmlinputelement.rs index 1180ea2307f..cd2a437e824 100644 --- a/components/script/dom/htmlinputelement.rs +++ b/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::htmldivelement::HTMLDivElement; -use crate::dom::htmlelement::HTMLElement; -use crate::dom::htmlfieldsetelement::HTMLFieldSetElement; -use crate::dom::htmlformelement::{ +use crate::dom::html::htmldatalistelement::HTMLDataListElement; +use crate::dom::html::htmldivelement::HTMLDivElement; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmlfieldsetelement::HTMLFieldSetElement; +use crate::dom::html::htmlformelement::{ FormControl, FormDatum, FormDatumValue, FormSubmitterElement, HTMLFormElement, ResetFrom, SubmittedFrom, }; diff --git a/components/script/dom/htmllabelelement.rs b/components/script/dom/html/htmllabelelement.rs similarity index 97% rename from components/script/dom/htmllabelelement.rs rename to components/script/dom/html/htmllabelelement.rs index 9733c3b7c6e..e59706fe8f6 100644 --- a/components/script/dom/htmllabelelement.rs +++ b/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::htmlformelement::{FormControl, FormControlElementHelpers, HTMLFormElement}; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmlformelement::{FormControl, FormControlElementHelpers, HTMLFormElement}; use crate::dom::node::{Node, ShadowIncluding}; use crate::dom::virtualmethods::VirtualMethods; use crate::script_runtime::CanGc; diff --git a/components/script/dom/htmllegendelement.rs b/components/script/dom/html/htmllegendelement.rs similarity index 94% rename from components/script/dom/htmllegendelement.rs rename to components/script/dom/html/htmllegendelement.rs index 35e983a9512..e214177f833 100644 --- a/components/script/dom/htmllegendelement.rs +++ b/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::htmlfieldsetelement::HTMLFieldSetElement; -use crate::dom::htmlformelement::{FormControl, HTMLFormElement}; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmlfieldsetelement::HTMLFieldSetElement; +use crate::dom::html::htmlformelement::{FormControl, HTMLFormElement}; use crate::dom::node::{BindContext, Node, UnbindContext}; use crate::dom::virtualmethods::VirtualMethods; use crate::script_runtime::CanGc; diff --git a/components/script/dom/htmllielement.rs b/components/script/dom/html/htmllielement.rs similarity index 97% rename from components/script/dom/htmllielement.rs rename to components/script/dom/html/htmllielement.rs index d72ffb4fa1d..1def16cb603 100644 --- a/components/script/dom/htmllielement.rs +++ b/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; diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/html/htmllinkelement.rs similarity index 99% rename from components/script/dom/htmllinkelement.rs rename to components/script/dom/html/htmllinkelement.rs index 34f95116b74..7caf80ec499 100644 --- a/components/script/dom/htmllinkelement.rs +++ b/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; diff --git a/components/script/dom/htmlmapelement.rs b/components/script/dom/html/htmlmapelement.rs similarity index 93% rename from components/script/dom/htmlmapelement.rs rename to components/script/dom/html/htmlmapelement.rs index 3f4a4356117..91a254ec82f 100644 --- a/components/script/dom/htmlmapelement.rs +++ b/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::htmlelement::HTMLElement; +use crate::dom::html::htmlareaelement::HTMLAreaElement; +use crate::dom::html::htmlelement::HTMLElement; use crate::dom::node::{Node, ShadowIncluding}; use crate::script_runtime::CanGc; diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/html/htmlmediaelement.rs similarity index 99% rename from components/script/dom/htmlmediaelement.rs rename to components/script/dom/html/htmlmediaelement.rs index d128d4f1edd..793d279be33 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/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::htmlscriptelement::HTMLScriptElement; -use crate::dom::htmlsourceelement::HTMLSourceElement; -use crate::dom::htmlstyleelement::HTMLStyleElement; -use crate::dom::htmlvideoelement::HTMLVideoElement; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmlscriptelement::HTMLScriptElement; +use crate::dom::html::htmlsourceelement::HTMLSourceElement; +use crate::dom::html::htmlstyleelement::HTMLStyleElement; +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 { diff --git a/components/script/dom/htmlmenuelement.rs b/components/script/dom/html/htmlmenuelement.rs similarity index 97% rename from components/script/dom/htmlmenuelement.rs rename to components/script/dom/html/htmlmenuelement.rs index 00d0447ef25..92304e66ae1 100644 --- a/components/script/dom/htmlmenuelement.rs +++ b/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; diff --git a/components/script/dom/htmlmetaelement.rs b/components/script/dom/html/htmlmetaelement.rs similarity index 98% rename from components/script/dom/htmlmetaelement.rs rename to components/script/dom/html/htmlmetaelement.rs index e5b32c353e2..7b64a3bb5ff 100644 --- a/components/script/dom/htmlmetaelement.rs +++ b/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::htmlheadelement::HTMLHeadElement; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmlheadelement::HTMLHeadElement; use crate::dom::node::{BindContext, Node, NodeTraits, UnbindContext}; use crate::dom::virtualmethods::VirtualMethods; use crate::script_runtime::CanGc; diff --git a/components/script/dom/htmlmeterelement.rs b/components/script/dom/html/htmlmeterelement.rs similarity index 99% rename from components/script/dom/htmlmeterelement.rs rename to components/script/dom/html/htmlmeterelement.rs index 51d721ccb23..0a7572d5857 100644 --- a/components/script/dom/htmlmeterelement.rs +++ b/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::htmlelement::HTMLElement; +use crate::dom::html::htmldivelement::HTMLDivElement; +use crate::dom::html::htmlelement::HTMLElement; use crate::dom::node::{BindContext, ChildrenMutation, Node, NodeTraits}; use crate::dom::nodelist::NodeList; use crate::dom::virtualmethods::VirtualMethods; diff --git a/components/script/dom/htmlmodelement.rs b/components/script/dom/html/htmlmodelement.rs similarity index 96% rename from components/script/dom/htmlmodelement.rs rename to components/script/dom/html/htmlmodelement.rs index 8bcd7cdc6f7..993243ccaf9 100644 --- a/components/script/dom/htmlmodelement.rs +++ b/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; diff --git a/components/script/dom/htmlobjectelement.rs b/components/script/dom/html/htmlobjectelement.rs similarity index 98% rename from components/script/dom/htmlobjectelement.rs rename to components/script/dom/html/htmlobjectelement.rs index c5c76601f5e..4f22ad5b6f2 100644 --- a/components/script/dom/htmlobjectelement.rs +++ b/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::htmlformelement::{FormControl, HTMLFormElement}; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmlformelement::{FormControl, HTMLFormElement}; use crate::dom::node::{Node, NodeTraits}; use crate::dom::validation::Validatable; use crate::dom::validitystate::ValidityState; diff --git a/components/script/dom/htmlolistelement.rs b/components/script/dom/html/htmlolistelement.rs similarity index 96% rename from components/script/dom/htmlolistelement.rs rename to components/script/dom/html/htmlolistelement.rs index 3b5851833c6..d303e9eb6bb 100644 --- a/components/script/dom/htmlolistelement.rs +++ b/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; diff --git a/components/script/dom/htmloptgroupelement.rs b/components/script/dom/html/htmloptgroupelement.rs similarity index 96% rename from components/script/dom/htmloptgroupelement.rs rename to components/script/dom/html/htmloptgroupelement.rs index f5256e71b70..97796af8a1e 100644 --- a/components/script/dom/htmloptgroupelement.rs +++ b/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::htmloptionelement::HTMLOptionElement; -use crate::dom::htmlselectelement::HTMLSelectElement; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmloptionelement::HTMLOptionElement; +use crate::dom::html::htmlselectelement::HTMLSelectElement; use crate::dom::node::{BindContext, Node, UnbindContext}; use crate::dom::validation::Validatable; use crate::dom::validitystate::ValidationFlags; diff --git a/components/script/dom/htmloptionelement.rs b/components/script/dom/html/htmloptionelement.rs similarity index 98% rename from components/script/dom/htmloptionelement.rs rename to components/script/dom/html/htmloptionelement.rs index 0fe4fc44087..f60b4fdb526 100644 --- a/components/script/dom/htmloptionelement.rs +++ b/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::htmlformelement::HTMLFormElement; -use crate::dom::htmloptgroupelement::HTMLOptGroupElement; -use crate::dom::htmlscriptelement::HTMLScriptElement; -use crate::dom::htmlselectelement::HTMLSelectElement; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmlformelement::HTMLFormElement; +use crate::dom::html::htmloptgroupelement::HTMLOptGroupElement; +use crate::dom::html::htmlscriptelement::HTMLScriptElement; +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; diff --git a/components/script/dom/htmloptionscollection.rs b/components/script/dom/html/htmloptionscollection.rs similarity index 97% rename from components/script/dom/htmloptionscollection.rs rename to components/script/dom/html/htmloptionscollection.rs index c16d1656b06..8d9d564811c 100644 --- a/components/script/dom/htmloptionscollection.rs +++ b/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::htmloptionelement::HTMLOptionElement; -use crate::dom::htmlselectelement::HTMLSelectElement; +use crate::dom::html::htmlcollection::{CollectionFilter, HTMLCollection}; +use crate::dom::html::htmloptionelement::HTMLOptionElement; +use crate::dom::html::htmlselectelement::HTMLSelectElement; use crate::dom::node::{Node, NodeTraits}; use crate::dom::window::Window; use crate::script_runtime::CanGc; diff --git a/components/script/dom/htmloutputelement.rs b/components/script/dom/html/htmloutputelement.rs similarity index 98% rename from components/script/dom/htmloutputelement.rs rename to components/script/dom/html/htmloutputelement.rs index 9e702d1eb6e..c46f766116c 100644 --- a/components/script/dom/htmloutputelement.rs +++ b/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::htmlformelement::{FormControl, HTMLFormElement}; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmlformelement::{FormControl, HTMLFormElement}; use crate::dom::node::{Node, NodeTraits}; use crate::dom::nodelist::NodeList; use crate::dom::validation::Validatable; diff --git a/components/script/dom/htmlparagraphelement.rs b/components/script/dom/html/htmlparagraphelement.rs similarity index 97% rename from components/script/dom/htmlparagraphelement.rs rename to components/script/dom/html/htmlparagraphelement.rs index 8cc16c6ba58..237e691bf1b 100644 --- a/components/script/dom/htmlparagraphelement.rs +++ b/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; diff --git a/components/script/dom/htmlparamelement.rs b/components/script/dom/html/htmlparamelement.rs similarity index 96% rename from components/script/dom/htmlparamelement.rs rename to components/script/dom/html/htmlparamelement.rs index d3f5abffbc2..b7fd463d81c 100644 --- a/components/script/dom/htmlparamelement.rs +++ b/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; diff --git a/components/script/dom/htmlpictureelement.rs b/components/script/dom/html/htmlpictureelement.rs similarity index 96% rename from components/script/dom/htmlpictureelement.rs rename to components/script/dom/html/htmlpictureelement.rs index 50062fee5ce..1ae3369325f 100644 --- a/components/script/dom/htmlpictureelement.rs +++ b/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; diff --git a/components/script/dom/htmlpreelement.rs b/components/script/dom/html/htmlpreelement.rs similarity index 97% rename from components/script/dom/htmlpreelement.rs rename to components/script/dom/html/htmlpreelement.rs index 45a4690045e..e28f63223fd 100644 --- a/components/script/dom/htmlpreelement.rs +++ b/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; diff --git a/components/script/dom/htmlprogresselement.rs b/components/script/dom/html/htmlprogresselement.rs similarity index 98% rename from components/script/dom/htmlprogresselement.rs rename to components/script/dom/html/htmlprogresselement.rs index c6707daa0c4..bba29fbecec 100644 --- a/components/script/dom/htmlprogresselement.rs +++ b/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::htmlelement::HTMLElement; +use crate::dom::html::htmldivelement::HTMLDivElement; +use crate::dom::html::htmlelement::HTMLElement; use crate::dom::node::{BindContext, Node, NodeTraits}; use crate::dom::nodelist::NodeList; use crate::dom::virtualmethods::VirtualMethods; diff --git a/components/script/dom/htmlquoteelement.rs b/components/script/dom/html/htmlquoteelement.rs similarity index 97% rename from components/script/dom/htmlquoteelement.rs rename to components/script/dom/html/htmlquoteelement.rs index dc46c96ea43..b625848c4f0 100644 --- a/components/script/dom/htmlquoteelement.rs +++ b/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; diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/html/htmlscriptelement.rs similarity index 99% rename from components/script/dom/htmlscriptelement.rs rename to components/script/dom/html/htmlscriptelement.rs index a467b005c19..ddd98330179 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/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; diff --git a/components/script/dom/htmlselectelement.rs b/components/script/dom/html/htmlselectelement.rs similarity index 98% rename from components/script/dom/htmlselectelement.rs rename to components/script/dom/html/htmlselectelement.rs index 26bf56382b6..2a1bd36f9da 100644 --- a/components/script/dom/htmlselectelement.rs +++ b/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::htmldivelement::HTMLDivElement; -use crate::dom::htmlelement::HTMLElement; -use crate::dom::htmlfieldsetelement::HTMLFieldSetElement; -use crate::dom::htmlformelement::{FormControl, FormDatum, FormDatumValue, HTMLFormElement}; -use crate::dom::htmloptgroupelement::HTMLOptGroupElement; -use crate::dom::htmloptionelement::HTMLOptionElement; -use crate::dom::htmloptionscollection::HTMLOptionsCollection; +use crate::dom::html::htmlcollection::CollectionFilter; +use crate::dom::html::htmldivelement::HTMLDivElement; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmlfieldsetelement::HTMLFieldSetElement; +use crate::dom::html::htmlformelement::{FormControl, FormDatum, FormDatumValue, HTMLFormElement}; +use crate::dom::html::htmloptgroupelement::HTMLOptGroupElement; +use crate::dom::html::htmloptionelement::HTMLOptionElement; +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; diff --git a/components/script/dom/htmlslotelement.rs b/components/script/dom/html/htmlslotelement.rs similarity index 98% rename from components/script/dom/htmlslotelement.rs rename to components/script/dom/html/htmlslotelement.rs index 0f77549a202..ae1d7fed1e1 100644 --- a/components/script/dom/htmlslotelement.rs +++ b/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); } diff --git a/components/script/dom/htmlsourceelement.rs b/components/script/dom/html/htmlsourceelement.rs similarity index 96% rename from components/script/dom/htmlsourceelement.rs rename to components/script/dom/html/htmlsourceelement.rs index e4b115e78a2..daa2796b315 100644 --- a/components/script/dom/htmlsourceelement.rs +++ b/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::htmlimageelement::HTMLImageElement; -use crate::dom::htmlmediaelement::HTMLMediaElement; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmlimageelement::HTMLImageElement; +use crate::dom::html::htmlmediaelement::HTMLMediaElement; use crate::dom::node::{BindContext, Node, UnbindContext}; use crate::dom::virtualmethods::VirtualMethods; use crate::script_runtime::CanGc; diff --git a/components/script/dom/htmlspanelement.rs b/components/script/dom/html/htmlspanelement.rs similarity index 96% rename from components/script/dom/htmlspanelement.rs rename to components/script/dom/html/htmlspanelement.rs index 4563477dc8c..4d3324b0991 100644 --- a/components/script/dom/htmlspanelement.rs +++ b/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; diff --git a/components/script/dom/htmlstyleelement.rs b/components/script/dom/html/htmlstyleelement.rs similarity index 99% rename from components/script/dom/htmlstyleelement.rs rename to components/script/dom/html/htmlstyleelement.rs index a53859fb2ef..dbc0bafef81 100644 --- a/components/script/dom/htmlstyleelement.rs +++ b/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; diff --git a/components/script/dom/htmltablecaptionelement.rs b/components/script/dom/html/htmltablecaptionelement.rs similarity index 96% rename from components/script/dom/htmltablecaptionelement.rs rename to components/script/dom/html/htmltablecaptionelement.rs index b6bae5a7485..ec042ae713f 100644 --- a/components/script/dom/htmltablecaptionelement.rs +++ b/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; diff --git a/components/script/dom/htmltablecellelement.rs b/components/script/dom/html/htmltablecellelement.rs similarity index 95% rename from components/script/dom/htmltablecellelement.rs rename to components/script/dom/html/htmltablecellelement.rs index 89bbf1e205a..e29f4709d5b 100644 --- a/components/script/dom/htmltablecellelement.rs +++ b/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 super::element::AttributeMutation; -use super::node::NodeDamage; +use crate::dom::attr::Attr; 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::htmlelement::HTMLElement; -use crate::dom::htmltableelement::HTMLTableElement; -use crate::dom::htmltablerowelement::HTMLTableRowElement; -use crate::dom::htmltablesectionelement::HTMLTableSectionElement; -use crate::dom::node::{LayoutNodeHelpers, Node}; +use crate::dom::element::{AttributeMutation, Element, LayoutElementHelpers}; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmltableelement::HTMLTableElement; +use crate::dom::html::htmltablerowelement::HTMLTableRowElement; +use crate::dom::html::htmltablesectionelement::HTMLTableSectionElement; +use crate::dom::node::{LayoutNodeHelpers, Node, NodeDamage}; use crate::dom::virtualmethods::VirtualMethods; use crate::script_runtime::CanGc; diff --git a/components/script/dom/htmltablecolelement.rs b/components/script/dom/html/htmltablecolelement.rs similarity index 93% rename from components/script/dom/htmltablecolelement.rs rename to components/script/dom/html/htmltablecolelement.rs index 4926e771e2d..4342122cb9c 100644 --- a/components/script/dom/htmltablecolelement.rs +++ b/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 super::bindings::root::LayoutDom; -use super::element::{AttributeMutation, Element}; -use super::node::NodeDamage; +use crate::dom::attr::Attr; 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::htmlelement::HTMLElement; -use crate::dom::node::Node; +use crate::dom::element::{AttributeMutation, Element, LayoutElementHelpers}; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::node::{Node, NodeDamage}; use crate::dom::virtualmethods::VirtualMethods; use crate::script_runtime::CanGc; diff --git a/components/script/dom/htmltableelement.rs b/components/script/dom/html/htmltableelement.rs similarity index 98% rename from components/script/dom/htmltableelement.rs rename to components/script/dom/html/htmltableelement.rs index c24ec5490c5..2ace42cd1ab 100644 --- a/components/script/dom/htmltableelement.rs +++ b/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::htmlelement::HTMLElement; -use crate::dom::htmltablecaptionelement::HTMLTableCaptionElement; -use crate::dom::htmltablecolelement::HTMLTableColElement; -use crate::dom::htmltablerowelement::HTMLTableRowElement; -use crate::dom::htmltablesectionelement::HTMLTableSectionElement; +use crate::dom::html::htmlcollection::{CollectionFilter, HTMLCollection}; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmltablecaptionelement::HTMLTableCaptionElement; +use crate::dom::html::htmltablecolelement::HTMLTableColElement; +use crate::dom::html::htmltablerowelement::HTMLTableRowElement; +use crate::dom::html::htmltablesectionelement::HTMLTableSectionElement; use crate::dom::node::{Node, NodeTraits}; use crate::dom::virtualmethods::VirtualMethods; use crate::script_runtime::CanGc; diff --git a/components/script/dom/htmltablerowelement.rs b/components/script/dom/html/htmltablerowelement.rs similarity index 95% rename from components/script/dom/htmltablerowelement.rs rename to components/script/dom/html/htmltablerowelement.rs index 6c2d502ce88..7dd855ba547 100644 --- a/components/script/dom/htmltablerowelement.rs +++ b/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::htmlelement::HTMLElement; -use crate::dom::htmltablecellelement::HTMLTableCellElement; -use crate::dom::htmltableelement::HTMLTableElement; -use crate::dom::htmltablesectionelement::HTMLTableSectionElement; +use crate::dom::html::htmlcollection::HTMLCollection; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmltablecellelement::HTMLTableCellElement; +use crate::dom::html::htmltableelement::HTMLTableElement; +use crate::dom::html::htmltablesectionelement::HTMLTableSectionElement; use crate::dom::node::{Node, NodeTraits}; use crate::dom::virtualmethods::VirtualMethods; use crate::script_runtime::CanGc; diff --git a/components/script/dom/htmltablesectionelement.rs b/components/script/dom/html/htmltablesectionelement.rs similarity index 96% rename from components/script/dom/htmltablesectionelement.rs rename to components/script/dom/html/htmltablesectionelement.rs index 60978c64fc1..4c402fcc372 100644 --- a/components/script/dom/htmltablesectionelement.rs +++ b/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::htmlelement::HTMLElement; -use crate::dom::htmltablerowelement::HTMLTableRowElement; +use crate::dom::html::htmlcollection::HTMLCollection; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmltablerowelement::HTMLTableRowElement; use crate::dom::node::{Node, NodeTraits}; use crate::dom::virtualmethods::VirtualMethods; use crate::script_runtime::CanGc; diff --git a/components/script/dom/htmltemplateelement.rs b/components/script/dom/html/htmltemplateelement.rs similarity index 99% rename from components/script/dom/htmltemplateelement.rs rename to components/script/dom/html/htmltemplateelement.rs index 128309b816b..a1b15222f4d 100644 --- a/components/script/dom/htmltemplateelement.rs +++ b/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; diff --git a/components/script/dom/htmltextareaelement.rs b/components/script/dom/html/htmltextareaelement.rs similarity index 99% rename from components/script/dom/htmltextareaelement.rs rename to components/script/dom/html/htmltextareaelement.rs index 91bcf365fdb..2757d26da2a 100644 --- a/components/script/dom/htmltextareaelement.rs +++ b/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::htmlfieldsetelement::HTMLFieldSetElement; -use crate::dom::htmlformelement::{FormControl, HTMLFormElement}; -use crate::dom::htmlinputelement::HTMLInputElement; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmlfieldsetelement::HTMLFieldSetElement; +use crate::dom::html::htmlformelement::{FormControl, HTMLFormElement}; +use crate::dom::html::htmlinputelement::HTMLInputElement; use crate::dom::keyboardevent::KeyboardEvent; use crate::dom::node::{ BindContext, ChildrenMutation, CloneChildrenFlag, Node, NodeDamage, NodeTraits, UnbindContext, diff --git a/components/script/dom/htmltimeelement.rs b/components/script/dom/html/htmltimeelement.rs similarity index 97% rename from components/script/dom/htmltimeelement.rs rename to components/script/dom/html/htmltimeelement.rs index 8f2ce66f636..37a0992d511 100644 --- a/components/script/dom/htmltimeelement.rs +++ b/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; diff --git a/components/script/dom/htmltitleelement.rs b/components/script/dom/html/htmltitleelement.rs similarity index 98% rename from components/script/dom/htmltitleelement.rs rename to components/script/dom/html/htmltitleelement.rs index 6a8a2af8f3d..cc46077fd1a 100644 --- a/components/script/dom/htmltitleelement.rs +++ b/components/script/dom/html/htmltitleelement.rs @@ -13,7 +13,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::{BindContext, ChildrenMutation, Node}; use crate::dom::virtualmethods::VirtualMethods; use crate::script_runtime::CanGc; diff --git a/components/script/dom/htmltrackelement.rs b/components/script/dom/html/htmltrackelement.rs similarity index 99% rename from components/script/dom/htmltrackelement.rs rename to components/script/dom/html/htmltrackelement.rs index 2341e90736b..21000365983 100644 --- a/components/script/dom/htmltrackelement.rs +++ b/components/script/dom/html/htmltrackelement.rs @@ -14,7 +14,7 @@ use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::bindings::str::{DOMString, USVString}; use crate::dom::document::Document; use crate::dom::element::Element; -use crate::dom::htmlelement::HTMLElement; +use crate::dom::html::htmlelement::HTMLElement; use crate::dom::node::Node; use crate::dom::texttrack::TextTrack; use crate::script_runtime::CanGc; diff --git a/components/script/dom/htmlulistelement.rs b/components/script/dom/html/htmlulistelement.rs similarity index 97% rename from components/script/dom/htmlulistelement.rs rename to components/script/dom/html/htmlulistelement.rs index 3ba9a9deb0b..ef22105d9a0 100644 --- a/components/script/dom/htmlulistelement.rs +++ b/components/script/dom/html/htmlulistelement.rs @@ -10,7 +10,7 @@ use crate::dom::bindings::codegen::Bindings::HTMLUListElementBinding::HTMLUListE 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; diff --git a/components/script/dom/htmlunknownelement.rs b/components/script/dom/html/htmlunknownelement.rs similarity index 96% rename from components/script/dom/htmlunknownelement.rs rename to components/script/dom/html/htmlunknownelement.rs index 1f51ea6cfa4..af572f92635 100644 --- a/components/script/dom/htmlunknownelement.rs +++ b/components/script/dom/html/htmlunknownelement.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; diff --git a/components/script/dom/htmlvideoelement.rs b/components/script/dom/html/htmlvideoelement.rs similarity index 99% rename from components/script/dom/htmlvideoelement.rs rename to components/script/dom/html/htmlvideoelement.rs index 1073d9b8a25..59410bfc622 100644 --- a/components/script/dom/htmlvideoelement.rs +++ b/components/script/dom/html/htmlvideoelement.rs @@ -37,7 +37,7 @@ use crate::dom::csp::{GlobalCspReporting, Violation}; use crate::dom::document::Document; use crate::dom::element::{AttributeMutation, Element, LayoutElementHelpers}; use crate::dom::globalscope::GlobalScope; -use crate::dom::htmlmediaelement::{HTMLMediaElement, NetworkState, ReadyState}; +use crate::dom::html::htmlmediaelement::{HTMLMediaElement, NetworkState, ReadyState}; use crate::dom::node::{Node, NodeTraits}; use crate::dom::performanceresourcetiming::InitiatorType; use crate::dom::virtualmethods::VirtualMethods; diff --git a/components/script/dom/html/mod.rs b/components/script/dom/html/mod.rs new file mode 100644 index 00000000000..ba2ff8468bf --- /dev/null +++ b/components/script/dom/html/mod.rs @@ -0,0 +1,81 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ + +pub(crate) mod htmlanchorelement; +pub(crate) mod htmlareaelement; +pub(crate) mod htmlaudioelement; +pub(crate) mod htmlbaseelement; +pub(crate) mod htmlbodyelement; +pub(crate) mod htmlbrelement; +pub(crate) mod htmlbuttonelement; +#[allow(dead_code)] +pub(crate) mod htmlcanvaselement; +pub(crate) mod htmlcollection; +pub(crate) mod htmldataelement; +pub(crate) mod htmldatalistelement; +pub(crate) mod htmldetailselement; +pub(crate) mod htmldialogelement; +pub(crate) mod htmldirectoryelement; +pub(crate) mod htmldivelement; +pub(crate) mod htmldlistelement; +pub(crate) mod htmldocument; +pub(crate) mod htmlelement; +pub(crate) mod htmlembedelement; +pub(crate) mod htmlfieldsetelement; +pub(crate) mod htmlfontelement; +pub(crate) mod htmlformcontrolscollection; +pub(crate) mod htmlformelement; +pub(crate) mod htmlframeelement; +pub(crate) mod htmlframesetelement; +pub(crate) mod htmlheadelement; +pub(crate) mod htmlheadingelement; +pub(crate) mod htmlhrelement; +pub(crate) mod htmlhtmlelement; +pub(crate) mod htmlhyperlinkelementutils; +pub(crate) mod htmliframeelement; +pub(crate) mod htmlimageelement; +pub(crate) mod htmlinputelement; +pub(crate) mod htmllabelelement; +pub(crate) mod htmllegendelement; +pub(crate) mod htmllielement; +pub(crate) mod htmllinkelement; +pub(crate) mod htmlmapelement; +pub(crate) mod htmlmediaelement; +pub(crate) mod htmlmenuelement; +pub(crate) mod htmlmetaelement; +pub(crate) mod htmlmeterelement; +pub(crate) mod htmlmodelement; +pub(crate) mod htmlobjectelement; +pub(crate) mod htmlolistelement; +pub(crate) mod htmloptgroupelement; +pub(crate) mod htmloptionelement; +pub(crate) mod htmloptionscollection; +pub(crate) mod htmloutputelement; +pub(crate) mod htmlparagraphelement; +pub(crate) mod htmlparamelement; +pub(crate) mod htmlpictureelement; +pub(crate) mod htmlpreelement; +pub(crate) mod htmlprogresselement; +pub(crate) mod htmlquoteelement; +#[allow(dead_code)] +pub(crate) mod htmlscriptelement; +pub(crate) mod htmlselectelement; +pub(crate) mod htmlslotelement; +pub(crate) mod htmlsourceelement; +pub(crate) mod htmlspanelement; +pub(crate) mod htmlstyleelement; +pub(crate) mod htmltablecaptionelement; +pub(crate) mod htmltablecellelement; +pub(crate) mod htmltablecolelement; +pub(crate) mod htmltableelement; +pub(crate) mod htmltablerowelement; +pub(crate) mod htmltablesectionelement; +pub(crate) mod htmltemplateelement; +pub(crate) mod htmltextareaelement; +pub(crate) mod htmltimeelement; +pub(crate) mod htmltitleelement; +pub(crate) mod htmltrackelement; +pub(crate) mod htmlulistelement; +pub(crate) mod htmlunknownelement; +pub(crate) mod htmlvideoelement; diff --git a/components/script/dom/macros.rs b/components/script/dom/macros.rs index d9e2ef62824..295e475112c 100644 --- a/components/script/dom/macros.rs +++ b/components/script/dom/macros.rs @@ -147,7 +147,7 @@ macro_rules! make_form_action_getter( macro_rules! make_labels_getter( ( $attr:ident, $memo:ident ) => ( fn $attr(&self) -> DomRoot { - use $crate::dom::htmlelement::HTMLElement; + use $crate::dom::html::htmlelement::HTMLElement; use $crate::dom::nodelist::NodeList; self.$memo.or_init(|| NodeList::new_labels_list( self.upcast::().owner_doc().window(), diff --git a/components/script/dom/mediasession.rs b/components/script/dom/mediasession.rs index 2d3b44dec7e..dae35772b48 100644 --- a/components/script/dom/mediasession.rs +++ b/components/script/dom/mediasession.rs @@ -27,7 +27,7 @@ use crate::dom::bindings::num::Finite; use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object}; use crate::dom::bindings::root::{DomRoot, MutNullableDom}; use crate::dom::bindings::str::DOMString; -use crate::dom::htmlmediaelement::HTMLMediaElement; +use crate::dom::html::htmlmediaelement::HTMLMediaElement; use crate::dom::mediametadata::MediaMetadata; use crate::dom::window::Window; use crate::realms::{InRealm, enter_realm}; diff --git a/components/script/dom/mod.rs b/components/script/dom/mod.rs index 9259e3e0a84..461f6ead783 100644 --- a/components/script/dom/mod.rs +++ b/components/script/dom/mod.rs @@ -330,83 +330,8 @@ pub(crate) mod globalscope; pub(crate) mod hashchangeevent; pub(crate) mod headers; pub(crate) mod history; -pub(crate) mod htmlanchorelement; -pub(crate) mod htmlareaelement; -pub(crate) mod htmlaudioelement; -pub(crate) mod htmlbaseelement; -pub(crate) mod htmlbodyelement; -pub(crate) mod htmlbrelement; -pub(crate) mod htmlbuttonelement; -#[allow(dead_code)] -pub(crate) mod htmlcanvaselement; -pub(crate) mod htmlcollection; -pub(crate) mod htmldataelement; -pub(crate) mod htmldatalistelement; -pub(crate) mod htmldetailselement; -pub(crate) mod htmldialogelement; -pub(crate) mod htmldirectoryelement; -pub(crate) mod htmldivelement; -pub(crate) mod htmldlistelement; -pub(crate) mod htmldocument; -pub(crate) mod htmlelement; -pub(crate) mod htmlembedelement; -pub(crate) mod htmlfieldsetelement; -pub(crate) mod htmlfontelement; -pub(crate) mod htmlformcontrolscollection; -pub(crate) mod htmlformelement; -pub(crate) mod htmlframeelement; -pub(crate) mod htmlframesetelement; -pub(crate) mod htmlheadelement; -pub(crate) mod htmlheadingelement; -pub(crate) mod htmlhrelement; -pub(crate) mod htmlhtmlelement; -pub(crate) mod htmlhyperlinkelementutils; -pub(crate) mod htmliframeelement; -pub(crate) mod htmlimageelement; -pub(crate) mod htmlinputelement; -pub(crate) mod htmllabelelement; -pub(crate) mod htmllegendelement; -pub(crate) mod htmllielement; -pub(crate) mod htmllinkelement; -pub(crate) mod htmlmapelement; -pub(crate) mod htmlmediaelement; -pub(crate) mod htmlmenuelement; -pub(crate) mod htmlmetaelement; -pub(crate) mod htmlmeterelement; -pub(crate) mod htmlmodelement; -pub(crate) mod htmlobjectelement; -pub(crate) mod htmlolistelement; -pub(crate) mod htmloptgroupelement; -pub(crate) mod htmloptionelement; -pub(crate) mod htmloptionscollection; -pub(crate) mod htmloutputelement; -pub(crate) mod htmlparagraphelement; -pub(crate) mod htmlparamelement; -pub(crate) mod htmlpictureelement; -pub(crate) mod htmlpreelement; -pub(crate) mod htmlprogresselement; -pub(crate) mod htmlquoteelement; -#[allow(dead_code)] -pub(crate) mod htmlscriptelement; -pub(crate) mod htmlselectelement; -pub(crate) mod htmlslotelement; -pub(crate) mod htmlsourceelement; -pub(crate) mod htmlspanelement; -pub(crate) mod htmlstyleelement; -pub(crate) mod htmltablecaptionelement; -pub(crate) mod htmltablecellelement; -pub(crate) mod htmltablecolelement; -pub(crate) mod htmltableelement; -pub(crate) mod htmltablerowelement; -pub(crate) mod htmltablesectionelement; -pub(crate) mod htmltemplateelement; -pub(crate) mod htmltextareaelement; -pub(crate) mod htmltimeelement; -pub(crate) mod htmltitleelement; -pub(crate) mod htmltrackelement; -pub(crate) mod htmlulistelement; -pub(crate) mod htmlunknownelement; -pub(crate) mod htmlvideoelement; +pub(crate) mod html; +pub(crate) use self::html::*; pub(crate) mod idbcursor; pub(crate) mod idbcursorwithvalue; pub(crate) mod idbdatabase; diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index efa698291b4..d143f3de441 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -95,17 +95,21 @@ use crate::dom::element::{CustomElementCreationMode, Element, ElementCreator, Se use crate::dom::event::{Event, EventBubbles, EventCancelable}; use crate::dom::eventtarget::EventTarget; use crate::dom::globalscope::GlobalScope; -use crate::dom::htmlcanvaselement::{HTMLCanvasElement, LayoutHTMLCanvasElementHelpers}; -use crate::dom::htmlcollection::HTMLCollection; -use crate::dom::htmlelement::HTMLElement; -use crate::dom::htmliframeelement::{HTMLIFrameElement, HTMLIFrameElementLayoutMethods}; -use crate::dom::htmlimageelement::{HTMLImageElement, LayoutHTMLImageElementHelpers}; -use crate::dom::htmlinputelement::{HTMLInputElement, InputType, LayoutHTMLInputElementHelpers}; -use crate::dom::htmllinkelement::HTMLLinkElement; -use crate::dom::htmlslotelement::{HTMLSlotElement, Slottable}; -use crate::dom::htmlstyleelement::HTMLStyleElement; -use crate::dom::htmltextareaelement::{HTMLTextAreaElement, LayoutHTMLTextAreaElementHelpers}; -use crate::dom::htmlvideoelement::{HTMLVideoElement, LayoutHTMLVideoElementHelpers}; +use crate::dom::html::htmlcanvaselement::{HTMLCanvasElement, LayoutHTMLCanvasElementHelpers}; +use crate::dom::html::htmlcollection::HTMLCollection; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmliframeelement::{HTMLIFrameElement, HTMLIFrameElementLayoutMethods}; +use crate::dom::html::htmlimageelement::{HTMLImageElement, LayoutHTMLImageElementHelpers}; +use crate::dom::html::htmlinputelement::{ + HTMLInputElement, InputType, LayoutHTMLInputElementHelpers, +}; +use crate::dom::html::htmllinkelement::HTMLLinkElement; +use crate::dom::html::htmlslotelement::{HTMLSlotElement, Slottable}; +use crate::dom::html::htmlstyleelement::HTMLStyleElement; +use crate::dom::html::htmltextareaelement::{ + HTMLTextAreaElement, LayoutHTMLTextAreaElementHelpers, +}; +use crate::dom::html::htmlvideoelement::{HTMLVideoElement, LayoutHTMLVideoElementHelpers}; use crate::dom::mutationobserver::{Mutation, MutationObserver, RegisteredObserver}; use crate::dom::nodelist::NodeList; use crate::dom::pointerevent::{PointerEvent, PointerId}; diff --git a/components/script/dom/nodelist.rs b/components/script/dom/nodelist.rs index 1ec2dc3f78b..f9bca7585b2 100644 --- a/components/script/dom/nodelist.rs +++ b/components/script/dom/nodelist.rs @@ -13,8 +13,8 @@ use crate::dom::bindings::reflector::{Reflector, reflect_dom_object}; use crate::dom::bindings::root::{Dom, DomRoot, MutNullableDom}; use crate::dom::bindings::str::DOMString; use crate::dom::document::Document; -use crate::dom::htmlelement::HTMLElement; -use crate::dom::htmlformelement::HTMLFormElement; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmlformelement::HTMLFormElement; use crate::dom::node::{ChildrenMutation, Node}; use crate::dom::window::Window; use crate::script_runtime::CanGc; diff --git a/components/script/dom/offscreencanvas.rs b/components/script/dom/offscreencanvas.rs index 3d10bd64b56..ced6a4cf76f 100644 --- a/components/script/dom/offscreencanvas.rs +++ b/components/script/dom/offscreencanvas.rs @@ -31,7 +31,7 @@ use crate::dom::bindings::transferable::Transferable; use crate::dom::blob::Blob; use crate::dom::eventtarget::EventTarget; use crate::dom::globalscope::GlobalScope; -use crate::dom::htmlcanvaselement::HTMLCanvasElement; +use crate::dom::html::htmlcanvaselement::HTMLCanvasElement; use crate::dom::imagebitmap::ImageBitmap; use crate::dom::imagebitmaprenderingcontext::ImageBitmapRenderingContext; use crate::dom::offscreencanvasrenderingcontext2d::OffscreenCanvasRenderingContext2D; diff --git a/components/script/dom/radionodelist.rs b/components/script/dom/radionodelist.rs index 0ad8cd4b622..6558b3971fd 100644 --- a/components/script/dom/radionodelist.rs +++ b/components/script/dom/radionodelist.rs @@ -12,8 +12,8 @@ use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::reflector::reflect_dom_object; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; -use crate::dom::htmlformelement::HTMLFormElement; -use crate::dom::htmlinputelement::{HTMLInputElement, InputType}; +use crate::dom::html::htmlformelement::HTMLFormElement; +use crate::dom::html::htmlinputelement::{HTMLInputElement, InputType}; use crate::dom::node::Node; use crate::dom::nodelist::{NodeList, NodeListType, RadioList, RadioListMode}; use crate::dom::window::Window; diff --git a/components/script/dom/range.rs b/components/script/dom/range.rs index b2fbd54f5e3..293742c478f 100644 --- a/components/script/dom/range.rs +++ b/components/script/dom/range.rs @@ -33,7 +33,7 @@ use crate::dom::documentfragment::DocumentFragment; use crate::dom::domrect::DOMRect; use crate::dom::domrectlist::DOMRectList; use crate::dom::element::Element; -use crate::dom::htmlscriptelement::HTMLScriptElement; +use crate::dom::html::htmlscriptelement::HTMLScriptElement; use crate::dom::node::{Node, NodeTraits, ShadowIncluding, UnbindContext}; use crate::dom::selection::Selection; use crate::dom::text::Text; diff --git a/components/script/dom/raredata.rs b/components/script/dom/raredata.rs index 5082c1d5878..ae098ca906a 100644 --- a/components/script/dom/raredata.rs +++ b/components/script/dom/raredata.rs @@ -14,7 +14,7 @@ use crate::dom::customelementregistry::{ }; use crate::dom::domtokenlist::DOMTokenList; use crate::dom::elementinternals::ElementInternals; -use crate::dom::htmlslotelement::SlottableData; +use crate::dom::html::htmlslotelement::SlottableData; use crate::dom::intersectionobserver::IntersectionObserverRegistration; use crate::dom::mutationobserver::RegisteredObserver; use crate::dom::node::UniqueId; diff --git a/components/script/dom/servoparser/async_html.rs b/components/script/dom/servoparser/async_html.rs index 4da99095a89..0959cbbde07 100644 --- a/components/script/dom/servoparser/async_html.rs +++ b/components/script/dom/servoparser/async_html.rs @@ -34,9 +34,9 @@ use crate::dom::customelementregistry::CustomElementReactionStack; use crate::dom::document::Document; use crate::dom::documenttype::DocumentType; use crate::dom::element::{Element, ElementCreator}; -use crate::dom::htmlformelement::{FormControlElementHelpers, HTMLFormElement}; -use crate::dom::htmlscriptelement::HTMLScriptElement; -use crate::dom::htmltemplateelement::HTMLTemplateElement; +use crate::dom::html::htmlformelement::{FormControlElementHelpers, HTMLFormElement}; +use crate::dom::html::htmlscriptelement::HTMLScriptElement; +use crate::dom::html::htmltemplateelement::HTMLTemplateElement; use crate::dom::node::Node; use crate::dom::processinginstruction::ProcessingInstruction; use crate::dom::servoparser::{ diff --git a/components/script/dom/servoparser/html.rs b/components/script/dom/servoparser/html.rs index 0d21733e583..0fc3207438a 100644 --- a/components/script/dom/servoparser/html.rs +++ b/components/script/dom/servoparser/html.rs @@ -30,8 +30,8 @@ use crate::dom::document::Document; use crate::dom::documentfragment::DocumentFragment; use crate::dom::documenttype::DocumentType; use crate::dom::element::Element; -use crate::dom::htmlscriptelement::HTMLScriptElement; -use crate::dom::htmltemplateelement::HTMLTemplateElement; +use crate::dom::html::htmlscriptelement::HTMLScriptElement; +use crate::dom::html::htmltemplateelement::HTMLTemplateElement; use crate::dom::node::Node; use crate::dom::processinginstruction::ProcessingInstruction; use crate::dom::servoparser::{ParsingAlgorithm, Sink}; diff --git a/components/script/dom/servoparser/mod.rs b/components/script/dom/servoparser/mod.rs index f1d90e74fe5..068e27b921f 100644 --- a/components/script/dom/servoparser/mod.rs +++ b/components/script/dom/servoparser/mod.rs @@ -63,11 +63,11 @@ use crate::dom::document::{Document, DocumentSource, HasBrowsingContext, IsHTMLD use crate::dom::documentfragment::DocumentFragment; use crate::dom::documenttype::DocumentType; use crate::dom::element::{CustomElementCreationMode, Element, ElementCreator}; -use crate::dom::htmlformelement::{FormControlElementHelpers, HTMLFormElement}; -use crate::dom::htmlimageelement::HTMLImageElement; -use crate::dom::htmlinputelement::HTMLInputElement; -use crate::dom::htmlscriptelement::{HTMLScriptElement, ScriptResult}; -use crate::dom::htmltemplateelement::HTMLTemplateElement; +use crate::dom::html::htmlformelement::{FormControlElementHelpers, HTMLFormElement}; +use crate::dom::html::htmlimageelement::HTMLImageElement; +use crate::dom::html::htmlinputelement::HTMLInputElement; +use crate::dom::html::htmlscriptelement::{HTMLScriptElement, ScriptResult}; +use crate::dom::html::htmltemplateelement::HTMLTemplateElement; use crate::dom::node::{Node, ShadowIncluding}; use crate::dom::performanceentry::PerformanceEntry; use crate::dom::performancenavigationtiming::PerformanceNavigationTiming; diff --git a/components/script/dom/servoparser/prefetch.rs b/components/script/dom/servoparser/prefetch.rs index f56ef114b34..fb7b869ebc2 100644 --- a/components/script/dom/servoparser/prefetch.rs +++ b/components/script/dom/servoparser/prefetch.rs @@ -24,7 +24,7 @@ use servo_url::{ImmutableOrigin, ServoUrl}; use crate::dom::bindings::reflector::DomGlobal; use crate::dom::bindings::trace::{CustomTraceable, JSTraceable}; use crate::dom::document::{Document, determine_policy_for_token}; -use crate::dom::htmlscriptelement::script_fetch_request; +use crate::dom::html::htmlscriptelement::script_fetch_request; use crate::fetch::create_a_potential_cors_request; use crate::script_module::ScriptFetchOptions; diff --git a/components/script/dom/servoparser/xml.rs b/components/script/dom/servoparser/xml.rs index c6de96ff70b..ad2e34dec62 100644 --- a/components/script/dom/servoparser/xml.rs +++ b/components/script/dom/servoparser/xml.rs @@ -16,7 +16,7 @@ use xml5ever::tree_builder::XmlTreeBuilder; use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::document::Document; -use crate::dom::htmlscriptelement::HTMLScriptElement; +use crate::dom::html::htmlscriptelement::HTMLScriptElement; use crate::dom::node::Node; use crate::dom::servoparser::{ParsingAlgorithm, Sink}; diff --git a/components/script/dom/shadowroot.rs b/components/script/dom/shadowroot.rs index 12ad7912e87..02c0191ba2a 100644 --- a/components/script/dom/shadowroot.rs +++ b/components/script/dom/shadowroot.rs @@ -44,7 +44,7 @@ use crate::dom::documentorshadowroot::{ DocumentOrShadowRoot, ServoStylesheetInDocument, StylesheetSource, }; use crate::dom::element::Element; -use crate::dom::htmlslotelement::HTMLSlotElement; +use crate::dom::html::htmlslotelement::HTMLSlotElement; use crate::dom::node::{ BindContext, Node, NodeDamage, NodeFlags, NodeTraits, ShadowIncluding, UnbindContext, VecPreOrderInsertionHelper, diff --git a/components/script/dom/submitevent.rs b/components/script/dom/submitevent.rs index c05a17856f6..34258ea423e 100644 --- a/components/script/dom/submitevent.rs +++ b/components/script/dom/submitevent.rs @@ -14,7 +14,7 @@ use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::event::Event; -use crate::dom::htmlelement::HTMLElement; +use crate::dom::html::htmlelement::HTMLElement; use crate::dom::window::Window; use crate::script_runtime::CanGc; diff --git a/components/script/dom/text.rs b/components/script/dom/text.rs index c5c8b2ce06b..a39bb65df23 100644 --- a/components/script/dom/text.rs +++ b/components/script/dom/text.rs @@ -17,7 +17,7 @@ use crate::dom::bindings::str::DOMString; use crate::dom::characterdata::CharacterData; use crate::dom::document::Document; use crate::dom::globalscope::GlobalScope; -use crate::dom::htmlslotelement::{HTMLSlotElement, Slottable}; +use crate::dom::html::htmlslotelement::{HTMLSlotElement, Slottable}; use crate::dom::node::Node; use crate::dom::window::Window; use crate::script_runtime::CanGc; diff --git a/components/script/dom/userscripts.rs b/components/script/dom/userscripts.rs index 6e291b67e31..afcbb29630d 100644 --- a/components/script/dom/userscripts.rs +++ b/components/script/dom/userscripts.rs @@ -8,8 +8,8 @@ use js::jsval::UndefinedValue; use script_bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; -use crate::dom::htmlheadelement::HTMLHeadElement; -use crate::dom::htmlscriptelement::SourceCode; +use crate::dom::html::htmlheadelement::HTMLHeadElement; +use crate::dom::html::htmlscriptelement::SourceCode; use crate::dom::node::NodeTraits; use crate::dom::window::Window; use crate::script_module::ScriptFetchOptions; diff --git a/components/script/dom/validation.rs b/components/script/dom/validation.rs index 0e8f26b58a4..c17d8ef0a9a 100755 --- a/components/script/dom/validation.rs +++ b/components/script/dom/validation.rs @@ -9,8 +9,8 @@ use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::element::Element; use crate::dom::eventtarget::EventTarget; -use crate::dom::htmldatalistelement::HTMLDataListElement; -use crate::dom::htmlelement::HTMLElement; +use crate::dom::html::htmldatalistelement::HTMLDataListElement; +use crate::dom::html::htmlelement::HTMLElement; use crate::dom::node::Node; use crate::dom::validitystate::{ValidationFlags, ValidityState}; use crate::script_runtime::CanGc; diff --git a/components/script/dom/validitystate.rs b/components/script/dom/validitystate.rs index f78103f2000..0377e605c82 100755 --- a/components/script/dom/validitystate.rs +++ b/components/script/dom/validitystate.rs @@ -18,8 +18,8 @@ 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::element::Element; -use crate::dom::htmlfieldsetelement::HTMLFieldSetElement; -use crate::dom::htmlformelement::FormControlElementHelpers; +use crate::dom::html::htmlfieldsetelement::HTMLFieldSetElement; +use crate::dom::html::htmlformelement::FormControlElementHelpers; use crate::dom::node::Node; use crate::dom::window::Window; use crate::script_runtime::CanGc; diff --git a/components/script/dom/videotracklist.rs b/components/script/dom/videotracklist.rs index 075d2c62c03..553173ecf9a 100644 --- a/components/script/dom/videotracklist.rs +++ b/components/script/dom/videotracklist.rs @@ -12,7 +12,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::videotrack::VideoTrack; use crate::dom::window::Window; use crate::script_runtime::CanGc; diff --git a/components/script/dom/virtualmethods.rs b/components/script/dom/virtualmethods.rs index 1d992b1f301..da985f11da9 100644 --- a/components/script/dom/virtualmethods.rs +++ b/components/script/dom/virtualmethods.rs @@ -16,48 +16,48 @@ use crate::dom::document::Document; use crate::dom::documentfragment::DocumentFragment; use crate::dom::element::{AttributeMutation, Element}; use crate::dom::event::Event; -use crate::dom::htmlanchorelement::HTMLAnchorElement; -use crate::dom::htmlareaelement::HTMLAreaElement; -use crate::dom::htmlbaseelement::HTMLBaseElement; -use crate::dom::htmlbodyelement::HTMLBodyElement; -use crate::dom::htmlbuttonelement::HTMLButtonElement; -use crate::dom::htmlcanvaselement::HTMLCanvasElement; -use crate::dom::htmldetailselement::HTMLDetailsElement; -use crate::dom::htmlelement::HTMLElement; -use crate::dom::htmlfieldsetelement::HTMLFieldSetElement; -use crate::dom::htmlfontelement::HTMLFontElement; -use crate::dom::htmlformelement::HTMLFormElement; -use crate::dom::htmlheadelement::HTMLHeadElement; -use crate::dom::htmlhrelement::HTMLHRElement; -use crate::dom::htmliframeelement::HTMLIFrameElement; -use crate::dom::htmlimageelement::HTMLImageElement; -use crate::dom::htmlinputelement::HTMLInputElement; -use crate::dom::htmllabelelement::HTMLLabelElement; -use crate::dom::htmllielement::HTMLLIElement; -use crate::dom::htmllinkelement::HTMLLinkElement; -use crate::dom::htmlmediaelement::HTMLMediaElement; -use crate::dom::htmlmetaelement::HTMLMetaElement; -use crate::dom::htmlmeterelement::HTMLMeterElement; -use crate::dom::htmlobjectelement::HTMLObjectElement; -use crate::dom::htmloptgroupelement::HTMLOptGroupElement; -use crate::dom::htmloptionelement::HTMLOptionElement; -use crate::dom::htmloutputelement::HTMLOutputElement; -use crate::dom::htmlpreelement::HTMLPreElement; -use crate::dom::htmlprogresselement::HTMLProgressElement; -use crate::dom::htmlscriptelement::HTMLScriptElement; -use crate::dom::htmlselectelement::HTMLSelectElement; -use crate::dom::htmlslotelement::HTMLSlotElement; -use crate::dom::htmlsourceelement::HTMLSourceElement; -use crate::dom::htmlstyleelement::HTMLStyleElement; -use crate::dom::htmltablecellelement::HTMLTableCellElement; -use crate::dom::htmltablecolelement::HTMLTableColElement; -use crate::dom::htmltableelement::HTMLTableElement; -use crate::dom::htmltablerowelement::HTMLTableRowElement; -use crate::dom::htmltablesectionelement::HTMLTableSectionElement; -use crate::dom::htmltemplateelement::HTMLTemplateElement; -use crate::dom::htmltextareaelement::HTMLTextAreaElement; -use crate::dom::htmltitleelement::HTMLTitleElement; -use crate::dom::htmlvideoelement::HTMLVideoElement; +use crate::dom::html::htmlanchorelement::HTMLAnchorElement; +use crate::dom::html::htmlareaelement::HTMLAreaElement; +use crate::dom::html::htmlbaseelement::HTMLBaseElement; +use crate::dom::html::htmlbodyelement::HTMLBodyElement; +use crate::dom::html::htmlbuttonelement::HTMLButtonElement; +use crate::dom::html::htmlcanvaselement::HTMLCanvasElement; +use crate::dom::html::htmldetailselement::HTMLDetailsElement; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmlfieldsetelement::HTMLFieldSetElement; +use crate::dom::html::htmlfontelement::HTMLFontElement; +use crate::dom::html::htmlformelement::HTMLFormElement; +use crate::dom::html::htmlheadelement::HTMLHeadElement; +use crate::dom::html::htmlhrelement::HTMLHRElement; +use crate::dom::html::htmliframeelement::HTMLIFrameElement; +use crate::dom::html::htmlimageelement::HTMLImageElement; +use crate::dom::html::htmlinputelement::HTMLInputElement; +use crate::dom::html::htmllabelelement::HTMLLabelElement; +use crate::dom::html::htmllielement::HTMLLIElement; +use crate::dom::html::htmllinkelement::HTMLLinkElement; +use crate::dom::html::htmlmediaelement::HTMLMediaElement; +use crate::dom::html::htmlmetaelement::HTMLMetaElement; +use crate::dom::html::htmlmeterelement::HTMLMeterElement; +use crate::dom::html::htmlobjectelement::HTMLObjectElement; +use crate::dom::html::htmloptgroupelement::HTMLOptGroupElement; +use crate::dom::html::htmloptionelement::HTMLOptionElement; +use crate::dom::html::htmloutputelement::HTMLOutputElement; +use crate::dom::html::htmlpreelement::HTMLPreElement; +use crate::dom::html::htmlprogresselement::HTMLProgressElement; +use crate::dom::html::htmlscriptelement::HTMLScriptElement; +use crate::dom::html::htmlselectelement::HTMLSelectElement; +use crate::dom::html::htmlslotelement::HTMLSlotElement; +use crate::dom::html::htmlsourceelement::HTMLSourceElement; +use crate::dom::html::htmlstyleelement::HTMLStyleElement; +use crate::dom::html::htmltablecellelement::HTMLTableCellElement; +use crate::dom::html::htmltablecolelement::HTMLTableColElement; +use crate::dom::html::htmltableelement::HTMLTableElement; +use crate::dom::html::htmltablerowelement::HTMLTableRowElement; +use crate::dom::html::htmltablesectionelement::HTMLTableSectionElement; +use crate::dom::html::htmltemplateelement::HTMLTemplateElement; +use crate::dom::html::htmltextareaelement::HTMLTextAreaElement; +use crate::dom::html::htmltitleelement::HTMLTitleElement; +use crate::dom::html::htmlvideoelement::HTMLVideoElement; use crate::dom::node::{BindContext, ChildrenMutation, CloneChildrenFlag, Node, UnbindContext}; use crate::dom::shadowroot::ShadowRoot; use crate::dom::svgelement::SVGElement; diff --git a/components/script/dom/webgl/webgl2renderingcontext.rs b/components/script/dom/webgl/webgl2renderingcontext.rs index b0924207d94..7117cf526cf 100644 --- a/components/script/dom/webgl/webgl2renderingcontext.rs +++ b/components/script/dom/webgl/webgl2renderingcontext.rs @@ -46,7 +46,7 @@ use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object}; use crate::dom::bindings::root::{Dom, DomRoot, LayoutDom, MutNullableDom, ToLayout}; use crate::dom::bindings::str::DOMString; use crate::dom::globalscope::GlobalScope; -use crate::dom::htmlcanvaselement::LayoutCanvasRenderingContextHelpers; +use crate::dom::html::htmlcanvaselement::LayoutCanvasRenderingContextHelpers; #[cfg(feature = "webxr")] use crate::dom::promise::Promise; use crate::dom::webgl::validations::WebGLValidator; diff --git a/components/script/dom/webgl/webglrenderingcontext.rs b/components/script/dom/webgl/webglrenderingcontext.rs index ccb8bc6eea5..6664639fb3d 100644 --- a/components/script/dom/webgl/webglrenderingcontext.rs +++ b/components/script/dom/webgl/webglrenderingcontext.rs @@ -56,7 +56,7 @@ use crate::dom::bindings::reflector::{DomGlobal, DomObject, Reflector, reflect_d use crate::dom::bindings::root::{DomOnceCell, DomRoot, LayoutDom, MutNullableDom}; use crate::dom::bindings::str::DOMString; use crate::dom::event::{Event, EventBubbles, EventCancelable}; -use crate::dom::htmlcanvaselement::LayoutCanvasRenderingContextHelpers; +use crate::dom::html::htmlcanvaselement::LayoutCanvasRenderingContextHelpers; use crate::dom::node::{Node, NodeDamage, NodeTraits}; #[cfg(feature = "webxr")] use crate::dom::promise::Promise; diff --git a/components/script/dom/webgpu/gpucanvascontext.rs b/components/script/dom/webgpu/gpucanvascontext.rs index 6cdbb837eb9..d3769695af0 100644 --- a/components/script/dom/webgpu/gpucanvascontext.rs +++ b/components/script/dom/webgpu/gpucanvascontext.rs @@ -37,7 +37,7 @@ use crate::dom::bindings::str::USVString; use crate::dom::bindings::weakref::WeakRef; use crate::dom::document::WebGPUContextsMap; use crate::dom::globalscope::GlobalScope; -use crate::dom::htmlcanvaselement::{HTMLCanvasElement, LayoutCanvasRenderingContextHelpers}; +use crate::dom::html::htmlcanvaselement::{HTMLCanvasElement, LayoutCanvasRenderingContextHelpers}; use crate::dom::node::NodeTraits; use crate::script_runtime::CanGc; diff --git a/components/script/dom/webxr/xrmediabinding.rs b/components/script/dom/webxr/xrmediabinding.rs index 34efebc6ca3..bf4be04fc55 100644 --- a/components/script/dom/webxr/xrmediabinding.rs +++ b/components/script/dom/webxr/xrmediabinding.rs @@ -10,7 +10,7 @@ use crate::dom::bindings::codegen::Bindings::XRMediaBindingBinding::XRMediaLayer use crate::dom::bindings::error::{Error, Fallible}; use crate::dom::bindings::reflector::{Reflector, reflect_dom_object_with_proto}; use crate::dom::bindings::root::{Dom, DomRoot}; -use crate::dom::htmlvideoelement::HTMLVideoElement; +use crate::dom::html::htmlvideoelement::HTMLVideoElement; use crate::dom::window::Window; use crate::dom::xrcylinderlayer::XRCylinderLayer; use crate::dom::xrequirectlayer::XREquirectLayer; diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index 8546b738592..58d23b7e71d 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -139,8 +139,8 @@ use crate::dom::eventtarget::EventTarget; use crate::dom::globalscope::GlobalScope; use crate::dom::hashchangeevent::HashChangeEvent; use crate::dom::history::History; -use crate::dom::htmlcollection::{CollectionFilter, HTMLCollection}; -use crate::dom::htmliframeelement::HTMLIFrameElement; +use crate::dom::html::htmlcollection::{CollectionFilter, HTMLCollection}; +use crate::dom::html::htmliframeelement::HTMLIFrameElement; use crate::dom::idbfactory::IDBFactory; use crate::dom::inputevent::HitTestResult; use crate::dom::location::Location; diff --git a/components/script/iframe_collection.rs b/components/script/iframe_collection.rs index b8828cd920c..8aca5f5e91b 100644 --- a/components/script/iframe_collection.rs +++ b/components/script/iframe_collection.rs @@ -12,7 +12,7 @@ use layout_api::IFrameSizes; use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::root::{Dom, DomRoot}; -use crate::dom::htmliframeelement::HTMLIFrameElement; +use crate::dom::html::htmliframeelement::HTMLIFrameElement; use crate::dom::node::{Node, ShadowIncluding}; use crate::dom::types::{Document, Window}; use crate::script_thread::with_script_thread; diff --git a/components/script/layout_dom/element.rs b/components/script/layout_dom/element.rs index 8f0eba8d911..18b17748dfd 100644 --- a/components/script/layout_dom/element.rs +++ b/components/script/layout_dom/element.rs @@ -50,7 +50,7 @@ use crate::dom::bindings::inheritance::{ use crate::dom::bindings::root::LayoutDom; use crate::dom::characterdata::LayoutCharacterDataHelpers; use crate::dom::element::{Element, LayoutElementHelpers}; -use crate::dom::htmlslotelement::HTMLSlotElement; +use crate::dom::html::htmlslotelement::HTMLSlotElement; use crate::dom::node::{LayoutNodeHelpers, Node, NodeFlags}; use crate::layout_dom::{ServoLayoutNode, ServoShadowRoot, ServoThreadSafeLayoutNode}; diff --git a/components/script/links.rs b/components/script/links.rs index 528ca717816..aa91a5731be 100644 --- a/components/script/links.rs +++ b/components/script/links.rs @@ -15,10 +15,10 @@ use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::refcounted::Trusted; use crate::dom::bindings::str::DOMString; use crate::dom::element::referrer_policy_for_element; -use crate::dom::htmlanchorelement::HTMLAnchorElement; -use crate::dom::htmlareaelement::HTMLAreaElement; -use crate::dom::htmlformelement::HTMLFormElement; -use crate::dom::htmllinkelement::HTMLLinkElement; +use crate::dom::html::htmlanchorelement::HTMLAnchorElement; +use crate::dom::html::htmlareaelement::HTMLAreaElement; +use crate::dom::html::htmlformelement::HTMLFormElement; +use crate::dom::html::htmllinkelement::HTMLLinkElement; use crate::dom::node::NodeTraits; use crate::dom::types::Element; use crate::script_runtime::CanGc; diff --git a/components/script/microtask.rs b/components/script/microtask.rs index 4796c37c901..b0608baf7c5 100644 --- a/components/script/microtask.rs +++ b/components/script/microtask.rs @@ -20,8 +20,8 @@ use crate::dom::bindings::codegen::Bindings::VoidFunctionBinding::VoidFunction; use crate::dom::bindings::root::DomRoot; use crate::dom::defaultteereadrequest::DefaultTeeReadRequestMicrotask; use crate::dom::globalscope::GlobalScope; -use crate::dom::htmlimageelement::ImageElementMicrotask; -use crate::dom::htmlmediaelement::MediaElementMicrotask; +use crate::dom::html::htmlimageelement::ImageElementMicrotask; +use crate::dom::html::htmlmediaelement::MediaElementMicrotask; use crate::dom::mutationobserver::MutationObserver; use crate::realms::enter_realm; use crate::script_runtime::{CanGc, JSContext, notify_about_rejected_promises}; diff --git a/components/script/script_module.rs b/components/script/script_module.rs index b83f2b60e6f..2eddf4b58fc 100644 --- a/components/script/script_module.rs +++ b/components/script/script_module.rs @@ -66,7 +66,7 @@ use crate::dom::document::Document; use crate::dom::dynamicmoduleowner::{DynamicModuleId, DynamicModuleOwner}; use crate::dom::element::Element; use crate::dom::globalscope::GlobalScope; -use crate::dom::htmlscriptelement::{ +use crate::dom::html::htmlscriptelement::{ HTMLScriptElement, SCRIPT_JS_MIMES, ScriptId, ScriptOrigin, ScriptType, }; use crate::dom::node::NodeTraits; diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index abde3d68851..22367eb859b 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -124,8 +124,8 @@ use crate::dom::document::{ }; use crate::dom::element::Element; use crate::dom::globalscope::GlobalScope; -use crate::dom::htmliframeelement::HTMLIFrameElement; -use crate::dom::htmlslotelement::HTMLSlotElement; +use crate::dom::html::htmliframeelement::HTMLIFrameElement; +use crate::dom::html::htmlslotelement::HTMLSlotElement; use crate::dom::mutationobserver::MutationObserver; use crate::dom::node::NodeTraits; use crate::dom::servoparser::{ParserContext, ServoParser}; diff --git a/components/script/stylesheet_loader.rs b/components/script/stylesheet_loader.rs index d78b5a6679b..68f8a2810a2 100644 --- a/components/script/stylesheet_loader.rs +++ b/components/script/stylesheet_loader.rs @@ -36,8 +36,8 @@ use crate::dom::document::Document; use crate::dom::element::Element; use crate::dom::eventtarget::EventTarget; use crate::dom::globalscope::GlobalScope; -use crate::dom::htmlelement::HTMLElement; -use crate::dom::htmllinkelement::{HTMLLinkElement, RequestGenerationId}; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmllinkelement::{HTMLLinkElement, RequestGenerationId}; use crate::dom::node::NodeTraits; use crate::dom::performanceresourcetiming::InitiatorType; use crate::dom::shadowroot::ShadowRoot; diff --git a/components/script/test.rs b/components/script/test.rs index db82070e5f0..c39bc8a6cab 100644 --- a/components/script/test.rs +++ b/components/script/test.rs @@ -10,7 +10,7 @@ pub use crate::dom::bindings::str::{ByteString, DOMString}; // pub use crate::dom::node::Node; pub mod area { - pub use crate::dom::htmlareaelement::{Area, Shape}; + pub use crate::dom::html::htmlareaelement::{Area, Shape}; } #[allow(non_snake_case)] @@ -20,9 +20,9 @@ pub mod size_of { use crate::dom::characterdata::CharacterData; use crate::dom::element::Element; use crate::dom::eventtarget::EventTarget; - use crate::dom::htmldivelement::HTMLDivElement; - use crate::dom::htmlelement::HTMLElement; - use crate::dom::htmlspanelement::HTMLSpanElement; + use crate::dom::html::htmldivelement::HTMLDivElement; + use crate::dom::html::htmlelement::HTMLElement; + use crate::dom::html::htmlspanelement::HTMLSpanElement; use crate::dom::node::Node; use crate::dom::text::Text; @@ -60,7 +60,9 @@ pub mod size_of { } pub mod srcset { - pub use crate::dom::htmlimageelement::{Descriptor, ImageSource, parse_a_srcset_attribute}; + pub use crate::dom::html::htmlimageelement::{ + Descriptor, ImageSource, parse_a_srcset_attribute, + }; } pub mod timeranges { diff --git a/components/script/webdriver_handlers.rs b/components/script/webdriver_handlers.rs index b97fcba4700..43b661dc1b1 100644 --- a/components/script/webdriver_handlers.rs +++ b/components/script/webdriver_handlers.rs @@ -67,16 +67,16 @@ use crate::dom::domrect::DOMRect; use crate::dom::element::Element; use crate::dom::eventtarget::EventTarget; use crate::dom::globalscope::GlobalScope; -use crate::dom::htmlbodyelement::HTMLBodyElement; -use crate::dom::htmldatalistelement::HTMLDataListElement; -use crate::dom::htmlelement::HTMLElement; -use crate::dom::htmlformelement::FormControl; -use crate::dom::htmliframeelement::HTMLIFrameElement; -use crate::dom::htmlinputelement::{HTMLInputElement, InputType}; -use crate::dom::htmloptgroupelement::HTMLOptGroupElement; -use crate::dom::htmloptionelement::HTMLOptionElement; -use crate::dom::htmlselectelement::HTMLSelectElement; -use crate::dom::htmltextareaelement::HTMLTextAreaElement; +use crate::dom::html::htmlbodyelement::HTMLBodyElement; +use crate::dom::html::htmldatalistelement::HTMLDataListElement; +use crate::dom::html::htmlelement::HTMLElement; +use crate::dom::html::htmlformelement::FormControl; +use crate::dom::html::htmliframeelement::HTMLIFrameElement; +use crate::dom::html::htmlinputelement::{HTMLInputElement, InputType}; +use crate::dom::html::htmloptgroupelement::HTMLOptGroupElement; +use crate::dom::html::htmloptionelement::HTMLOptionElement; +use crate::dom::html::htmlselectelement::HTMLSelectElement; +use crate::dom::html::htmltextareaelement::HTMLTextAreaElement; use crate::dom::node::{Node, NodeTraits, ShadowIncluding}; use crate::dom::nodelist::NodeList; use crate::dom::types::ShadowRoot;