LibWeb: Move HTML object model stuff into LibWeb/HTML/

Take a hint from SVG and more all the HTML classes into HTML instead of
mixing them with the DOM classes.

Applications/Browser/BrowserConsoleClient.cpp

@@ -33,7 +33,7 @@
 #include <LibJS/Interpreter.h>
 #include <LibWeb/DOM/DocumentType.h>
 #include <LibWeb/DOM/ElementFactory.h>
-#include <LibWeb/DOM/HTMLBodyElement.h>
+#include <LibWeb/HTML/HTMLBodyElement.h>
 #include <LibWeb/DOM/Text.h>
 #include <LibWeb/DOMTreeModel.h>
 

Applications/Browser/ConsoleWidget.cpp

@@ -36,7 +36,7 @@
 #include <LibJS/Runtime/Error.h>
 #include <LibWeb/DOM/DocumentType.h>
 #include <LibWeb/DOM/ElementFactory.h>
-#include <LibWeb/DOM/HTMLBodyElement.h>
+#include <LibWeb/HTML/HTMLBodyElement.h>
 #include <LibWeb/DOM/Text.h>
 #include <LibWeb/DOMTreeModel.h>
 

Applications/IRCClient/IRCLogBuffer.cpp

@@ -29,7 +29,7 @@
 #include <LibWeb/DOM/DocumentFragment.h>
 #include <LibWeb/DOM/DocumentType.h>
 #include <LibWeb/DOM/ElementFactory.h>
-#include <LibWeb/DOM/HTMLBodyElement.h>
+#include <LibWeb/HTML/HTMLBodyElement.h>
 #include <LibWeb/DOM/Text.h>
 #include <time.h>
 

DevTools/HackStudio/Editor.cpp

@@ -38,7 +38,7 @@
 #include <LibGUI/Window.h>
 #include <LibMarkdown/Document.h>
 #include <LibWeb/DOM/ElementFactory.h>
-#include <LibWeb/DOM/HTMLHeadElement.h>
+#include <LibWeb/HTML/HTMLHeadElement.h>
 #include <LibWeb/DOM/Text.h>
 #include <LibWeb/PageView.h>
 

Libraries/LibWeb/Bindings/NodeWrapperFactory.cpp

@@ -31,8 +31,8 @@
 #include <LibWeb/Bindings/HTMLElementWrapper.h>
 #include <LibWeb/Bindings/NodeWrapper.h>
 #include <LibWeb/DOM/Document.h>
-#include <LibWeb/DOM/HTMLCanvasElement.h>
-#include <LibWeb/DOM/HTMLImageElement.h>
+#include <LibWeb/HTML/HTMLCanvasElement.h>
+#include <LibWeb/HTML/HTMLImageElement.h>
 #include <LibWeb/DOM/Node.h>
 
 namespace Web {

Libraries/LibWeb/CMakeLists.txt

@@ -20,7 +20,6 @@ set(SOURCES
     CSS/StyleSheetList.cpp
     CSS/StyleValue.cpp
     DOM/AttributeNames.cpp
-    DOM/CanvasRenderingContext2D.cpp
     DOM/CharacterData.cpp
     DOM/Comment.cpp
     DOM/Document.cpp
@@ -29,30 +28,6 @@ set(SOURCES
     DOM/ElementFactory.cpp
     DOM/EventListener.cpp
     DOM/EventTarget.cpp
-    DOM/HTMLAnchorElement.cpp
-    DOM/HTMLBlinkElement.cpp
-    DOM/HTMLBodyElement.cpp
-    DOM/HTMLBRElement.cpp
-    DOM/HTMLCanvasElement.cpp
-    DOM/HTMLElement.cpp
-    DOM/HTMLFontElement.cpp
-    DOM/HTMLFormElement.cpp
-    DOM/HTMLHeadElement.cpp
-    DOM/HTMLHeadingElement.cpp
-    DOM/HTMLHRElement.cpp
-    DOM/HTMLHtmlElement.cpp
-    DOM/HTMLIFrameElement.cpp
-    DOM/HTMLImageElement.cpp
-    DOM/HTMLInputElement.cpp
-    DOM/HTMLObjectElement.cpp
-    DOM/HTMLLinkElement.cpp
-    DOM/HTMLScriptElement.cpp
-    DOM/HTMLStyleElement.cpp
-    DOM/HTMLTableElement.cpp
-    DOM/HTMLTableCellElement.cpp
-    DOM/HTMLTableRowElement.cpp
-    DOM/HTMLTitleElement.cpp
-    DOM/ImageData.cpp
     DOM/Node.cpp
     DOM/ParentNode.cpp
     DOM/TagNames.cpp
@@ -65,6 +40,31 @@ set(SOURCES
     FontCache.cpp
     Frame/EventHandler.cpp
     Frame/Frame.cpp
+    HTML/CanvasRenderingContext2D.cpp
+    HTML/HTMLAnchorElement.cpp
+    HTML/HTMLBRElement.cpp
+    HTML/HTMLBlinkElement.cpp
+    HTML/HTMLBodyElement.cpp
+    HTML/HTMLCanvasElement.cpp
+    HTML/HTMLElement.cpp
+    HTML/HTMLFontElement.cpp
+    HTML/HTMLFormElement.cpp
+    HTML/HTMLHRElement.cpp
+    HTML/HTMLHeadElement.cpp
+    HTML/HTMLHeadingElement.cpp
+    HTML/HTMLHtmlElement.cpp
+    HTML/HTMLIFrameElement.cpp
+    HTML/HTMLImageElement.cpp
+    HTML/HTMLInputElement.cpp
+    HTML/HTMLLinkElement.cpp
+    HTML/HTMLObjectElement.cpp
+    HTML/HTMLScriptElement.cpp
+    HTML/HTMLStyleElement.cpp
+    HTML/HTMLTableCellElement.cpp
+    HTML/HTMLTableElement.cpp
+    HTML/HTMLTableRowElement.cpp
+    HTML/HTMLTitleElement.cpp
+    HTML/ImageData.cpp
     Layout/BoxModelMetrics.cpp
     Layout/LayoutBlock.cpp
     Layout/LayoutBox.cpp
@@ -139,39 +139,40 @@ function(add_wrapper_sources)
 endfunction(add_wrapper_sources)
 
 function(libweb_js_wrapper class)
-    add_wrapper_sources(Bindings/${class}Wrapper.cpp Bindings/${class}Wrapper.h)
+    get_filename_component(basename ${class} NAME)
+    add_wrapper_sources(Bindings/${basename}Wrapper.cpp Bindings/${basename}Wrapper.h)
     add_custom_command(
-        OUTPUT Bindings/${class}Wrapper.h
+        OUTPUT Bindings/${basename}Wrapper.h
         COMMAND /bin/mkdir -p Bindings
-        COMMAND WrapperGenerator --header ${CMAKE_CURRENT_SOURCE_DIR}/DOM/${class}.idl > Bindings/${class}Wrapper.h
+        COMMAND WrapperGenerator --header ${CMAKE_CURRENT_SOURCE_DIR}/${class}.idl > Bindings/${basename}Wrapper.h
         VERBATIM
         DEPENDS WrapperGenerator
-        MAIN_DEPENDENCY DOM/${class}.idl
+        MAIN_DEPENDENCY ${class}.idl
     )
     add_custom_command(
-        OUTPUT Bindings/${class}Wrapper.cpp
+        OUTPUT Bindings/${basename}Wrapper.cpp
         COMMAND /bin/mkdir -p Bindings
-        COMMAND WrapperGenerator --implementation ${CMAKE_CURRENT_SOURCE_DIR}/DOM/${class}.idl > Bindings/${class}Wrapper.cpp
+        COMMAND WrapperGenerator --implementation ${CMAKE_CURRENT_SOURCE_DIR}/${class}.idl > Bindings/${basename}Wrapper.cpp
         VERBATIM
         DEPENDS WrapperGenerator
-        MAIN_DEPENDENCY DOM/${class}.idl
+        MAIN_DEPENDENCY ${class}.idl
     )
-    add_custom_target(generate_${class}Wrapper.h DEPENDS Bindings/${class}Wrapper.h)
-    add_custom_target(generate_${class}Wrapper.cpp DEPENDS Bindings/${class}Wrapper.cpp)
+    add_custom_target(generate_${basename}Wrapper.h DEPENDS Bindings/${class}Wrapper.h)
+    add_custom_target(generate_${basename}Wrapper.cpp DEPENDS Bindings/${class}Wrapper.cpp)
 endfunction()
 
-libweb_js_wrapper(EventTarget)
-libweb_js_wrapper(Node)
-libweb_js_wrapper(Document)
-libweb_js_wrapper(DocumentType)
-libweb_js_wrapper(Element)
-libweb_js_wrapper(HTMLElement)
-libweb_js_wrapper(HTMLImageElement)
-libweb_js_wrapper(HTMLCanvasElement)
-libweb_js_wrapper(ImageData)
-libweb_js_wrapper(Event)
-libweb_js_wrapper(MouseEvent)
-libweb_js_wrapper(CanvasRenderingContext2D)
+libweb_js_wrapper(DOM/Document)
+libweb_js_wrapper(DOM/DocumentType)
+libweb_js_wrapper(DOM/Element)
+libweb_js_wrapper(DOM/Event)
+libweb_js_wrapper(DOM/EventTarget)
+libweb_js_wrapper(DOM/MouseEvent)
+libweb_js_wrapper(DOM/Node)
+libweb_js_wrapper(HTML/CanvasRenderingContext2D)
+libweb_js_wrapper(HTML/HTMLCanvasElement)
+libweb_js_wrapper(HTML/HTMLElement)
+libweb_js_wrapper(HTML/HTMLImageElement)
+libweb_js_wrapper(HTML/ImageData)
 
 get_property(WRAPPER_SOURCES GLOBAL PROPERTY wrapper_sources)
 set(SOURCES ${SOURCES} ${WRAPPER_SOURCES})

Libraries/LibWeb/CSS/Length.cpp

@@ -26,7 +26,7 @@
 
 #include <LibWeb/CSS/Length.h>
 #include <LibWeb/DOM/Document.h>
-#include <LibWeb/DOM/HTMLHtmlElement.h>
+#include <LibWeb/HTML/HTMLHtmlElement.h>
 
 namespace Web {
 

Libraries/LibWeb/CodeGenerators/WrapperGenerator.cpp

@@ -391,7 +391,13 @@ static void generate_header(const IDL::Interface& interface)
 
     out() << "#pragma once";
     out() << "#include <LibWeb/Bindings/Wrapper.h>";
+
+    // FIXME: This is very strange.
+    out() << "#if __has_include(<LibWeb/DOM/" << interface.name << ".h>)";
     out() << "#include <LibWeb/DOM/" << interface.name << ".h>";
+    out() << "#else";
+    out() << "#include <LibWeb/HTML/" << interface.name << ".h>";
+    out() << "#endif";
 
     if (wrapper_base_class != "Wrapper")
         out() << "#include <LibWeb/Bindings/" << wrapper_base_class << ".h>";
@@ -459,7 +465,7 @@ void generate_implementation(const IDL::Interface& interface)
     out() << "#include <LibWeb/Bindings/NodeWrapperFactory.h>";
     out() << "#include <LibWeb/Bindings/" << wrapper_class << ".h>";
     out() << "#include <LibWeb/DOM/Element.h>";
-    out() << "#include <LibWeb/DOM/HTMLElement.h>";
+    out() << "#include <LibWeb/HTML/HTMLElement.h>";
     out() << "#include <LibWeb/DOM/EventListener.h>";
     out() << "#include <LibWeb/Bindings/DocumentTypeWrapper.h>";
     out() << "#include <LibWeb/Bindings/HTMLCanvasElementWrapper.h>";

Libraries/LibWeb/DOM/Document.cpp

@@ -42,11 +42,11 @@
 #include <LibWeb/DOM/DocumentType.h>
 #include <LibWeb/DOM/Element.h>
 #include <LibWeb/DOM/ElementFactory.h>
-#include <LibWeb/DOM/HTMLBodyElement.h>
-#include <LibWeb/DOM/HTMLHeadElement.h>
-#include <LibWeb/DOM/HTMLHtmlElement.h>
-#include <LibWeb/DOM/HTMLScriptElement.h>
-#include <LibWeb/DOM/HTMLTitleElement.h>
+#include <LibWeb/HTML/HTMLBodyElement.h>
+#include <LibWeb/HTML/HTMLHeadElement.h>
+#include <LibWeb/HTML/HTMLHtmlElement.h>
+#include <LibWeb/HTML/HTMLScriptElement.h>
+#include <LibWeb/HTML/HTMLTitleElement.h>
 #include <LibWeb/DOM/Text.h>
 #include <LibWeb/DOM/Window.h>
 #include <LibWeb/Dump.h>

Libraries/LibWeb/DOM/ElementFactory.cpp

@@ -25,28 +25,28 @@
  */
 
 #include <LibWeb/DOM/ElementFactory.h>
-#include <LibWeb/DOM/HTMLAnchorElement.h>
-#include <LibWeb/DOM/HTMLBRElement.h>
-#include <LibWeb/DOM/HTMLBlinkElement.h>
-#include <LibWeb/DOM/HTMLBodyElement.h>
-#include <LibWeb/DOM/HTMLCanvasElement.h>
-#include <LibWeb/DOM/HTMLFontElement.h>
-#include <LibWeb/DOM/HTMLFormElement.h>
-#include <LibWeb/DOM/HTMLHRElement.h>
-#include <LibWeb/DOM/HTMLHeadElement.h>
-#include <LibWeb/DOM/HTMLHeadingElement.h>
-#include <LibWeb/DOM/HTMLHtmlElement.h>
-#include <LibWeb/DOM/HTMLIFrameElement.h>
-#include <LibWeb/DOM/HTMLImageElement.h>
-#include <LibWeb/DOM/HTMLInputElement.h>
-#include <LibWeb/DOM/HTMLLinkElement.h>
-#include <LibWeb/DOM/HTMLObjectElement.h>
-#include <LibWeb/DOM/HTMLScriptElement.h>
-#include <LibWeb/DOM/HTMLStyleElement.h>
-#include <LibWeb/DOM/HTMLTableCellElement.h>
-#include <LibWeb/DOM/HTMLTableElement.h>
-#include <LibWeb/DOM/HTMLTableRowElement.h>
-#include <LibWeb/DOM/HTMLTitleElement.h>
+#include <LibWeb/HTML/HTMLAnchorElement.h>
+#include <LibWeb/HTML/HTMLBRElement.h>
+#include <LibWeb/HTML/HTMLBlinkElement.h>
+#include <LibWeb/HTML/HTMLBodyElement.h>
+#include <LibWeb/HTML/HTMLCanvasElement.h>
+#include <LibWeb/HTML/HTMLFontElement.h>
+#include <LibWeb/HTML/HTMLFormElement.h>
+#include <LibWeb/HTML/HTMLHRElement.h>
+#include <LibWeb/HTML/HTMLHeadElement.h>
+#include <LibWeb/HTML/HTMLHeadingElement.h>
+#include <LibWeb/HTML/HTMLHtmlElement.h>
+#include <LibWeb/HTML/HTMLIFrameElement.h>
+#include <LibWeb/HTML/HTMLImageElement.h>
+#include <LibWeb/HTML/HTMLInputElement.h>
+#include <LibWeb/HTML/HTMLLinkElement.h>
+#include <LibWeb/HTML/HTMLObjectElement.h>
+#include <LibWeb/HTML/HTMLScriptElement.h>
+#include <LibWeb/HTML/HTMLStyleElement.h>
+#include <LibWeb/HTML/HTMLTableCellElement.h>
+#include <LibWeb/HTML/HTMLTableElement.h>
+#include <LibWeb/HTML/HTMLTableRowElement.h>
+#include <LibWeb/HTML/HTMLTitleElement.h>
 #include <LibWeb/SVG/SVGPathElement.h>
 #include <LibWeb/SVG/SVGSVGElement.h>
 #include <LibWeb/SVG/TagNames.h>

Libraries/LibWeb/DOM/Node.cpp

@@ -38,7 +38,7 @@
 #include <LibWeb/DOM/Element.h>
 #include <LibWeb/DOM/Event.h>
 #include <LibWeb/DOM/EventListener.h>
-#include <LibWeb/DOM/HTMLAnchorElement.h>
+#include <LibWeb/HTML/HTMLAnchorElement.h>
 #include <LibWeb/DOM/Node.h>
 #include <LibWeb/Layout/LayoutBlock.h>
 #include <LibWeb/Layout/LayoutDocument.h>

Libraries/LibWeb/Frame/EventHandler.cpp

@@ -28,8 +28,8 @@
 #include <LibGUI/Window.h>
 #include <LibJS/Runtime/Value.h>
 #include <LibWeb/DOM/Document.h>
-#include <LibWeb/DOM/HTMLAnchorElement.h>
-#include <LibWeb/DOM/HTMLIFrameElement.h>
+#include <LibWeb/HTML/HTMLAnchorElement.h>
+#include <LibWeb/HTML/HTMLIFrameElement.h>
 #include <LibWeb/DOM/MouseEvent.h>
 #include <LibWeb/Frame/EventHandler.h>
 #include <LibWeb/Frame/Frame.h>

Libraries/LibWeb/Frame/Frame.cpp

@@ -25,7 +25,7 @@
  */
 
 #include <LibWeb/DOM/Document.h>
-#include <LibWeb/DOM/HTMLAnchorElement.h>
+#include <LibWeb/HTML/HTMLAnchorElement.h>
 #include <LibWeb/Frame/Frame.h>
 #include <LibWeb/Layout/LayoutDocument.h>
 #include <LibWeb/Layout/LayoutWidget.h>

Libraries/LibWeb/HTML/CanvasRenderingContext2D.cpp

@@ -27,10 +27,10 @@
 #include <AK/OwnPtr.h>
 #include <LibGfx/Painter.h>
 #include <LibWeb/Bindings/CanvasRenderingContext2DWrapper.h>
-#include <LibWeb/DOM/CanvasRenderingContext2D.h>
-#include <LibWeb/DOM/HTMLCanvasElement.h>
-#include <LibWeb/DOM/HTMLImageElement.h>
-#include <LibWeb/DOM/ImageData.h>
+#include <LibWeb/HTML/CanvasRenderingContext2D.h>
+#include <LibWeb/HTML/HTMLCanvasElement.h>
+#include <LibWeb/HTML/HTMLImageElement.h>
+#include <LibWeb/HTML/ImageData.h>
 
 namespace Web {
 

Libraries/LibWeb/HTML/HTMLAnchorElement.cpp

@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibWeb/DOM/HTMLAnchorElement.h>
+#include <LibWeb/HTML/HTMLAnchorElement.h>
 
 namespace Web {
 

Libraries/LibWeb/HTML/HTMLAnchorElement.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibWeb/DOM/HTMLElement.h>
+#include <LibWeb/HTML/HTMLElement.h>
 
 namespace Web {
 

Libraries/LibWeb/HTML/HTMLBRElement.cpp

@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibWeb/DOM/HTMLBRElement.h>
+#include <LibWeb/HTML/HTMLBRElement.h>
 #include <LibWeb/Layout/LayoutBreak.h>
 
 namespace Web {

Libraries/LibWeb/HTML/HTMLBRElement.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibWeb/DOM/HTMLElement.h>
+#include <LibWeb/HTML/HTMLElement.h>
 
 namespace Web {
 

Libraries/LibWeb/HTML/HTMLBlinkElement.cpp

@@ -27,7 +27,7 @@
 #include <LibCore/Timer.h>
 #include <LibWeb/CSS/StyleProperties.h>
 #include <LibWeb/CSS/StyleValue.h>
-#include <LibWeb/DOM/HTMLBlinkElement.h>
+#include <LibWeb/HTML/HTMLBlinkElement.h>
 #include <LibWeb/Layout/LayoutNode.h>
 
 namespace Web {

Libraries/LibWeb/HTML/HTMLBlinkElement.h

@@ -27,7 +27,7 @@
 #pragma once
 
 #include <LibCore/Forward.h>
-#include <LibWeb/DOM/HTMLElement.h>
+#include <LibWeb/HTML/HTMLElement.h>
 
 namespace Web {
 

Libraries/LibWeb/HTML/HTMLBodyElement.cpp

@@ -27,7 +27,7 @@
 #include <LibWeb/CSS/StyleProperties.h>
 #include <LibWeb/CSS/StyleValue.h>
 #include <LibWeb/DOM/Document.h>
-#include <LibWeb/DOM/HTMLBodyElement.h>
+#include <LibWeb/HTML/HTMLBodyElement.h>
 
 namespace Web {
 

Libraries/LibWeb/HTML/HTMLBodyElement.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibWeb/DOM/HTMLElement.h>
+#include <LibWeb/HTML/HTMLElement.h>
 
 namespace Web {
 

Libraries/LibWeb/HTML/HTMLCanvasElement.cpp

@@ -27,9 +27,9 @@
 #include <AK/Checked.h>
 #include <LibGfx/Bitmap.h>
 #include <LibWeb/CSS/StyleResolver.h>
-#include <LibWeb/DOM/CanvasRenderingContext2D.h>
 #include <LibWeb/DOM/Document.h>
-#include <LibWeb/DOM/HTMLCanvasElement.h>
+#include <LibWeb/HTML/CanvasRenderingContext2D.h>
+#include <LibWeb/HTML/HTMLCanvasElement.h>
 #include <LibWeb/Layout/LayoutCanvas.h>
 
 namespace Web {

Libraries/LibWeb/HTML/HTMLCanvasElement.h

@@ -28,7 +28,7 @@
 
 #include <AK/ByteBuffer.h>
 #include <LibGfx/Forward.h>
-#include <LibWeb/DOM/HTMLElement.h>
+#include <LibWeb/HTML/HTMLElement.h>
 
 namespace Web {
 

Libraries/LibWeb/HTML/HTMLElement.cpp

@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibWeb/DOM/HTMLElement.h>
+#include <LibWeb/HTML/HTMLElement.h>
 
 namespace Web {
 

Libraries/LibWeb/HTML/HTMLFontElement.cpp

@@ -26,7 +26,7 @@
 
 #include <LibWeb/CSS/StyleProperties.h>
 #include <LibWeb/CSS/StyleValue.h>
-#include <LibWeb/DOM/HTMLFontElement.h>
+#include <LibWeb/HTML/HTMLFontElement.h>
 
 namespace Web {
 

Libraries/LibWeb/HTML/HTMLFontElement.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibWeb/DOM/HTMLElement.h>
+#include <LibWeb/HTML/HTMLElement.h>
 
 namespace Web {
 

Libraries/LibWeb/HTML/HTMLFormElement.cpp

@@ -25,8 +25,8 @@
  */
 
 #include <AK/StringBuilder.h>
-#include <LibWeb/DOM/HTMLFormElement.h>
-#include <LibWeb/DOM/HTMLInputElement.h>
+#include <LibWeb/HTML/HTMLFormElement.h>
+#include <LibWeb/HTML/HTMLInputElement.h>
 #include <LibWeb/Frame/Frame.h>
 #include <LibWeb/PageView.h>
 #include <LibWeb/URLEncoder.h>

Libraries/LibWeb/HTML/HTMLFormElement.h

@@ -26,8 +26,8 @@
 
 #pragma once
 
-#include <LibWeb/DOM/HTMLElement.h>
-#include <LibWeb/DOM/HTMLInputElement.h>
+#include <LibWeb/HTML/HTMLElement.h>
+#include <LibWeb/HTML/HTMLInputElement.h>
 
 namespace Web {
 

Libraries/LibWeb/HTML/HTMLHRElement.cpp

@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibWeb/DOM/HTMLHRElement.h>
+#include <LibWeb/HTML/HTMLHRElement.h>
 
 namespace Web {
 

Libraries/LibWeb/HTML/HTMLHRElement.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibWeb/DOM/HTMLElement.h>
+#include <LibWeb/HTML/HTMLElement.h>
 
 namespace Web {
 

Libraries/LibWeb/HTML/HTMLHeadElement.cpp

@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibWeb/DOM/HTMLHeadElement.h>
+#include <LibWeb/HTML/HTMLHeadElement.h>
 
 namespace Web {
 

Libraries/LibWeb/HTML/HTMLHeadElement.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibWeb/DOM/HTMLElement.h>
+#include <LibWeb/HTML/HTMLElement.h>
 
 namespace Web {
 

Libraries/LibWeb/HTML/HTMLHeadingElement.cpp

@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibWeb/DOM/HTMLHeadingElement.h>
+#include <LibWeb/HTML/HTMLHeadingElement.h>
 
 namespace Web {
 

Libraries/LibWeb/HTML/HTMLHeadingElement.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibWeb/DOM/HTMLElement.h>
+#include <LibWeb/HTML/HTMLElement.h>
 
 namespace Web {
 

Libraries/LibWeb/HTML/HTMLHtmlElement.cpp

@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibWeb/DOM/HTMLHtmlElement.h>
+#include <LibWeb/HTML/HTMLHtmlElement.h>
 
 namespace Web {
 

Libraries/LibWeb/HTML/HTMLHtmlElement.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibWeb/DOM/HTMLElement.h>
+#include <LibWeb/HTML/HTMLElement.h>
 
 namespace Web {
 

Libraries/LibWeb/HTML/HTMLIFrameElement.cpp

@@ -29,8 +29,8 @@
 #include <LibGUI/TextBox.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/DOM/Event.h>
-#include <LibWeb/DOM/HTMLFormElement.h>
-#include <LibWeb/DOM/HTMLIFrameElement.h>
+#include <LibWeb/HTML/HTMLFormElement.h>
+#include <LibWeb/HTML/HTMLIFrameElement.h>
 #include <LibWeb/Dump.h>
 #include <LibWeb/Frame/Frame.h>
 #include <LibWeb/Layout/LayoutFrame.h>

Libraries/LibWeb/HTML/HTMLIFrameElement.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibWeb/DOM/HTMLElement.h>
+#include <LibWeb/HTML/HTMLElement.h>
 
 namespace Web {
 

Libraries/LibWeb/HTML/HTMLImageElement.cpp

@@ -30,7 +30,7 @@
 #include <LibWeb/CSS/StyleResolver.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/DOM/Event.h>
-#include <LibWeb/DOM/HTMLImageElement.h>
+#include <LibWeb/HTML/HTMLImageElement.h>
 #include <LibWeb/Layout/LayoutImage.h>
 #include <LibWeb/Loader/ResourceLoader.h>
 #include <LibWeb/Parser/CSSParser.h>

Libraries/LibWeb/HTML/HTMLImageElement.h

@@ -29,7 +29,7 @@
 #include <AK/ByteBuffer.h>
 #include <AK/OwnPtr.h>
 #include <LibGfx/Forward.h>
-#include <LibWeb/DOM/HTMLElement.h>
+#include <LibWeb/HTML/HTMLElement.h>
 #include <LibWeb/Loader/ImageLoader.h>
 
 namespace Web {

Libraries/LibWeb/HTML/HTMLInputElement.cpp

@@ -29,8 +29,8 @@
 #include <LibGUI/TextBox.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/DOM/Event.h>
-#include <LibWeb/DOM/HTMLFormElement.h>
-#include <LibWeb/DOM/HTMLInputElement.h>
+#include <LibWeb/HTML/HTMLFormElement.h>
+#include <LibWeb/HTML/HTMLInputElement.h>
 #include <LibWeb/Frame/Frame.h>
 #include <LibWeb/Layout/LayoutWidget.h>
 #include <LibWeb/PageView.h>

Libraries/LibWeb/HTML/HTMLInputElement.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibWeb/DOM/HTMLElement.h>
+#include <LibWeb/HTML/HTMLElement.h>
 
 namespace Web {
 

Libraries/LibWeb/HTML/HTMLLinkElement.cpp

@@ -28,7 +28,7 @@
 #include <AK/URL.h>
 #include <LibCore/File.h>
 #include <LibWeb/DOM/Document.h>
-#include <LibWeb/DOM/HTMLLinkElement.h>
+#include <LibWeb/HTML/HTMLLinkElement.h>
 #include <LibWeb/Loader/ResourceLoader.h>
 #include <LibWeb/Parser/CSSParser.h>
 

Libraries/LibWeb/HTML/HTMLLinkElement.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibWeb/DOM/HTMLElement.h>
+#include <LibWeb/HTML/HTMLElement.h>
 #include <LibWeb/Loader/Resource.h>
 
 namespace Web {

Libraries/LibWeb/HTML/HTMLObjectElement.cpp

@@ -29,7 +29,7 @@
 #include <LibWeb/CSS/StyleResolver.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/DOM/Event.h>
-#include <LibWeb/DOM/HTMLObjectElement.h>
+#include <LibWeb/HTML/HTMLObjectElement.h>
 #include <LibWeb/Layout/LayoutImage.h>
 #include <LibWeb/Loader/ResourceLoader.h>
 

Libraries/LibWeb/HTML/HTMLObjectElement.h

@@ -28,7 +28,7 @@
 
 #include <LibCore/Forward.h>
 #include <LibGfx/Forward.h>
-#include <LibWeb/DOM/HTMLElement.h>
+#include <LibWeb/HTML/HTMLElement.h>
 #include <LibWeb/Loader/ImageLoader.h>
 
 namespace Web {

Libraries/LibWeb/HTML/HTMLScriptElement.cpp

@@ -28,7 +28,7 @@
 #include <LibJS/Interpreter.h>
 #include <LibJS/Parser.h>
 #include <LibWeb/DOM/Document.h>
-#include <LibWeb/DOM/HTMLScriptElement.h>
+#include <LibWeb/HTML/HTMLScriptElement.h>
 #include <LibWeb/DOM/Text.h>
 #include <LibWeb/Loader/ResourceLoader.h>
 

Libraries/LibWeb/HTML/HTMLScriptElement.h

@@ -27,7 +27,7 @@
 #pragma once
 
 #include <AK/Function.h>
-#include <LibWeb/DOM/HTMLElement.h>
+#include <LibWeb/HTML/HTMLElement.h>
 
 namespace Web {
 

Libraries/LibWeb/HTML/HTMLStyleElement.cpp

@@ -26,7 +26,7 @@
 
 #include <AK/StringBuilder.h>
 #include <LibWeb/DOM/Document.h>
-#include <LibWeb/DOM/HTMLStyleElement.h>
+#include <LibWeb/HTML/HTMLStyleElement.h>
 #include <LibWeb/DOM/Text.h>
 #include <LibWeb/Parser/CSSParser.h>
 

Libraries/LibWeb/HTML/HTMLStyleElement.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibWeb/DOM/HTMLElement.h>
+#include <LibWeb/HTML/HTMLElement.h>
 
 namespace Web {
 

Libraries/LibWeb/HTML/HTMLTableCellElement.cpp

@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibWeb/DOM/HTMLTableCellElement.h>
+#include <LibWeb/HTML/HTMLTableCellElement.h>
 #include <LibWeb/Parser/CSSParser.h>
 
 namespace Web {

Libraries/LibWeb/HTML/HTMLTableCellElement.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibWeb/DOM/HTMLElement.h>
+#include <LibWeb/HTML/HTMLElement.h>
 
 namespace Web {
 

Libraries/LibWeb/HTML/HTMLTableElement.cpp

@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibWeb/DOM/HTMLTableElement.h>
+#include <LibWeb/HTML/HTMLTableElement.h>
 #include <LibWeb/Parser/CSSParser.h>
 
 namespace Web {

Libraries/LibWeb/HTML/HTMLTableElement.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibWeb/DOM/HTMLElement.h>
+#include <LibWeb/HTML/HTMLElement.h>
 
 namespace Web {
 

Libraries/LibWeb/HTML/HTMLTableRowElement.cpp

@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibWeb/DOM/HTMLTableRowElement.h>
+#include <LibWeb/HTML/HTMLTableRowElement.h>
 
 namespace Web {
 

Libraries/LibWeb/HTML/HTMLTableRowElement.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibWeb/DOM/HTMLElement.h>
+#include <LibWeb/HTML/HTMLElement.h>
 
 namespace Web {
 

Libraries/LibWeb/HTML/HTMLTitleElement.cpp

@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibWeb/DOM/HTMLTitleElement.h>
+#include <LibWeb/HTML/HTMLTitleElement.h>
 
 namespace Web {
 

Libraries/LibWeb/HTML/HTMLTitleElement.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibWeb/DOM/HTMLElement.h>
+#include <LibWeb/HTML/HTMLElement.h>
 
 namespace Web {
 

Libraries/LibWeb/HTML/ImageData.cpp

@@ -26,7 +26,7 @@
 
 #include <LibGfx/Bitmap.h>
 #include <LibJS/Runtime/Uint8ClampedArray.h>
-#include <LibWeb/DOM/ImageData.h>
+#include <LibWeb/HTML/ImageData.h>
 
 namespace Web {
 

Libraries/LibWeb/Layout/LayoutBox.cpp

@@ -26,7 +26,7 @@
 
 #include <LibGUI/Painter.h>
 #include <LibWeb/DOM/Document.h>
-#include <LibWeb/DOM/HTMLBodyElement.h>
+#include <LibWeb/HTML/HTMLBodyElement.h>
 #include <LibWeb/Frame/Frame.h>
 #include <LibWeb/Layout/LayoutBlock.h>
 #include <LibWeb/Layout/LayoutBox.h>

Libraries/LibWeb/Layout/LayoutBreak.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibWeb/DOM/HTMLBRElement.h>
+#include <LibWeb/HTML/HTMLBRElement.h>
 #include <LibWeb/Layout/LayoutNode.h>
 
 namespace Web {

Libraries/LibWeb/Layout/LayoutCanvas.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibWeb/DOM/HTMLCanvasElement.h>
+#include <LibWeb/HTML/HTMLCanvasElement.h>
 #include <LibWeb/Layout/LayoutReplaced.h>
 
 namespace Web {

Libraries/LibWeb/Layout/LayoutFrame.h

@@ -27,7 +27,7 @@
 #pragma once
 
 #include <LibWeb/Layout/LayoutReplaced.h>
-#include <LibWeb/DOM/HTMLIFrameElement.h>
+#include <LibWeb/HTML/HTMLIFrameElement.h>
 
 namespace Web {
 

Libraries/LibWeb/Layout/LayoutImage.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibWeb/DOM/HTMLImageElement.h>
+#include <LibWeb/HTML/HTMLImageElement.h>
 #include <LibWeb/Layout/LayoutReplaced.h>
 
 namespace Web {

Libraries/LibWeb/Loader/Resource.cpp

@@ -25,7 +25,7 @@
  */
 
 #include <AK/Function.h>
-#include <LibWeb/DOM/HTMLImageElement.h>
+#include <LibWeb/HTML/HTMLImageElement.h>
 #include <LibWeb/Loader/Resource.h>
 
 namespace Web {

Libraries/LibWeb/PageView.cpp

@@ -38,8 +38,8 @@
 #include <LibJS/Runtime/Value.h>
 #include <LibWeb/DOM/Element.h>
 #include <LibWeb/DOM/ElementFactory.h>
-#include <LibWeb/DOM/HTMLAnchorElement.h>
-#include <LibWeb/DOM/HTMLImageElement.h>
+#include <LibWeb/HTML/HTMLAnchorElement.h>
+#include <LibWeb/HTML/HTMLImageElement.h>
 #include <LibWeb/DOM/MouseEvent.h>
 #include <LibWeb/DOM/Text.h>
 #include <LibWeb/Dump.h>

Libraries/LibWeb/Parser/HTMLDocumentParser.cpp

@@ -32,9 +32,9 @@
 #include <LibWeb/DOM/DocumentType.h>
 #include <LibWeb/DOM/ElementFactory.h>
 #include <LibWeb/DOM/Event.h>
-#include <LibWeb/DOM/HTMLFormElement.h>
-#include <LibWeb/DOM/HTMLHeadElement.h>
-#include <LibWeb/DOM/HTMLScriptElement.h>
+#include <LibWeb/HTML/HTMLFormElement.h>
+#include <LibWeb/HTML/HTMLHeadElement.h>
+#include <LibWeb/HTML/HTMLScriptElement.h>
 #include <LibWeb/DOM/Text.h>
 #include <LibWeb/Parser/HTMLDocumentParser.h>
 #include <LibWeb/Parser/HTMLToken.h>

Libraries/LibWeb/SVG/SVGPathElement.h

@@ -27,7 +27,7 @@
 #pragma once
 
 #include <LibGfx/Bitmap.h>
-#include <LibWeb/DOM/HTMLElement.h>
+#include <LibWeb/HTML/HTMLElement.h>
 #include <LibWeb/SVG/SVGGeometryElement.h>
 
 namespace Web::SVG {