diff options
Diffstat (limited to 'Libraries/LibWeb')
| -rw-r--r-- | Libraries/LibWeb/Bindings/NodeWrapperFactory.cpp | 4 | ||||
| -rw-r--r-- | Libraries/LibWeb/CMakeLists.txt | 93 | ||||
| -rw-r--r-- | Libraries/LibWeb/CSS/Length.cpp | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/CodeGenerators/WrapperGenerator.cpp | 8 | ||||
| -rw-r--r-- | Libraries/LibWeb/DOM/Document.cpp | 10 | ||||
| -rw-r--r-- | Libraries/LibWeb/DOM/ElementFactory.cpp | 44 | ||||
| -rw-r--r-- | Libraries/LibWeb/DOM/Node.cpp | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/Frame/EventHandler.cpp | 4 | ||||
| -rw-r--r-- | Libraries/LibWeb/Frame/Frame.cpp | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/CanvasRenderingContext2D.cpp (renamed from Libraries/LibWeb/DOM/CanvasRenderingContext2D.cpp) | 8 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/CanvasRenderingContext2D.h (renamed from Libraries/LibWeb/DOM/CanvasRenderingContext2D.h) | 0 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/CanvasRenderingContext2D.idl (renamed from Libraries/LibWeb/DOM/CanvasRenderingContext2D.idl) | 0 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLAnchorElement.cpp (renamed from Libraries/LibWeb/DOM/HTMLAnchorElement.cpp) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLAnchorElement.h (renamed from Libraries/LibWeb/DOM/HTMLAnchorElement.h) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLBRElement.cpp (renamed from Libraries/LibWeb/DOM/HTMLBRElement.cpp) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLBRElement.h (renamed from Libraries/LibWeb/DOM/HTMLBRElement.h) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLBlinkElement.cpp (renamed from Libraries/LibWeb/DOM/HTMLBlinkElement.cpp) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLBlinkElement.h (renamed from Libraries/LibWeb/DOM/HTMLBlinkElement.h) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLBodyElement.cpp (renamed from Libraries/LibWeb/DOM/HTMLBodyElement.cpp) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLBodyElement.h (renamed from Libraries/LibWeb/DOM/HTMLBodyElement.h) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLCanvasElement.cpp (renamed from Libraries/LibWeb/DOM/HTMLCanvasElement.cpp) | 4 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLCanvasElement.h (renamed from Libraries/LibWeb/DOM/HTMLCanvasElement.h) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLCanvasElement.idl (renamed from Libraries/LibWeb/DOM/HTMLCanvasElement.idl) | 0 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLElement.cpp (renamed from Libraries/LibWeb/DOM/HTMLElement.cpp) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLElement.h (renamed from Libraries/LibWeb/DOM/HTMLElement.h) | 0 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLElement.idl (renamed from Libraries/LibWeb/DOM/HTMLElement.idl) | 0 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLFontElement.cpp (renamed from Libraries/LibWeb/DOM/HTMLFontElement.cpp) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLFontElement.h (renamed from Libraries/LibWeb/DOM/HTMLFontElement.h) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLFormElement.cpp (renamed from Libraries/LibWeb/DOM/HTMLFormElement.cpp) | 4 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLFormElement.h (renamed from Libraries/LibWeb/DOM/HTMLFormElement.h) | 4 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLHRElement.cpp (renamed from Libraries/LibWeb/DOM/HTMLHRElement.cpp) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLHRElement.h (renamed from Libraries/LibWeb/DOM/HTMLHRElement.h) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLHeadElement.cpp (renamed from Libraries/LibWeb/DOM/HTMLHeadElement.cpp) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLHeadElement.h (renamed from Libraries/LibWeb/DOM/HTMLHeadElement.h) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLHeadingElement.cpp (renamed from Libraries/LibWeb/DOM/HTMLHeadingElement.cpp) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLHeadingElement.h (renamed from Libraries/LibWeb/DOM/HTMLHeadingElement.h) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLHtmlElement.cpp (renamed from Libraries/LibWeb/DOM/HTMLHtmlElement.cpp) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLHtmlElement.h (renamed from Libraries/LibWeb/DOM/HTMLHtmlElement.h) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLIFrameElement.cpp (renamed from Libraries/LibWeb/DOM/HTMLIFrameElement.cpp) | 4 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLIFrameElement.h (renamed from Libraries/LibWeb/DOM/HTMLIFrameElement.h) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLImageElement.cpp (renamed from Libraries/LibWeb/DOM/HTMLImageElement.cpp) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLImageElement.h (renamed from Libraries/LibWeb/DOM/HTMLImageElement.h) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLImageElement.idl (renamed from Libraries/LibWeb/DOM/HTMLImageElement.idl) | 0 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLInputElement.cpp (renamed from Libraries/LibWeb/DOM/HTMLInputElement.cpp) | 4 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLInputElement.h (renamed from Libraries/LibWeb/DOM/HTMLInputElement.h) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLLinkElement.cpp (renamed from Libraries/LibWeb/DOM/HTMLLinkElement.cpp) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLLinkElement.h (renamed from Libraries/LibWeb/DOM/HTMLLinkElement.h) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLObjectElement.cpp (renamed from Libraries/LibWeb/DOM/HTMLObjectElement.cpp) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLObjectElement.h (renamed from Libraries/LibWeb/DOM/HTMLObjectElement.h) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLScriptElement.cpp (renamed from Libraries/LibWeb/DOM/HTMLScriptElement.cpp) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLScriptElement.h (renamed from Libraries/LibWeb/DOM/HTMLScriptElement.h) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLStyleElement.cpp (renamed from Libraries/LibWeb/DOM/HTMLStyleElement.cpp) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLStyleElement.h (renamed from Libraries/LibWeb/DOM/HTMLStyleElement.h) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLTableCellElement.cpp (renamed from Libraries/LibWeb/DOM/HTMLTableCellElement.cpp) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLTableCellElement.h (renamed from Libraries/LibWeb/DOM/HTMLTableCellElement.h) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLTableElement.cpp (renamed from Libraries/LibWeb/DOM/HTMLTableElement.cpp) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLTableElement.h (renamed from Libraries/LibWeb/DOM/HTMLTableElement.h) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLTableRowElement.cpp (renamed from Libraries/LibWeb/DOM/HTMLTableRowElement.cpp) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLTableRowElement.h (renamed from Libraries/LibWeb/DOM/HTMLTableRowElement.h) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLTitleElement.cpp (renamed from Libraries/LibWeb/DOM/HTMLTitleElement.cpp) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/HTMLTitleElement.h (renamed from Libraries/LibWeb/DOM/HTMLTitleElement.h) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/ImageData.cpp (renamed from Libraries/LibWeb/DOM/ImageData.cpp) | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/ImageData.h (renamed from Libraries/LibWeb/DOM/ImageData.h) | 0 | ||||
| -rw-r--r-- | Libraries/LibWeb/HTML/ImageData.idl (renamed from Libraries/LibWeb/DOM/ImageData.idl) | 0 | ||||
| -rw-r--r-- | Libraries/LibWeb/Layout/LayoutBox.cpp | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/Layout/LayoutBreak.h | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/Layout/LayoutCanvas.h | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/Layout/LayoutFrame.h | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/Layout/LayoutImage.h | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/Loader/Resource.cpp | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/PageView.cpp | 4 | ||||
| -rw-r--r-- | Libraries/LibWeb/Parser/HTMLDocumentParser.cpp | 6 | ||||
| -rw-r--r-- | Libraries/LibWeb/SVG/SVGPathElement.h | 2 |
73 files changed, 155 insertions, 148 deletions
diff --git a/Libraries/LibWeb/Bindings/NodeWrapperFactory.cpp b/Libraries/LibWeb/Bindings/NodeWrapperFactory.cpp index d102fc6404..576deeaa11 100644 --- a/Libraries/LibWeb/Bindings/NodeWrapperFactory.cpp +++ b/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 { diff --git a/Libraries/LibWeb/CMakeLists.txt b/Libraries/LibWeb/CMakeLists.txt index 8c3081faa7..24be8f4c35 100644 --- a/Libraries/LibWeb/CMakeLists.txt +++ b/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}) diff --git a/Libraries/LibWeb/CSS/Length.cpp b/Libraries/LibWeb/CSS/Length.cpp index e71cffda40..76d9b55ecc 100644 --- a/Libraries/LibWeb/CSS/Length.cpp +++ b/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 { diff --git a/Libraries/LibWeb/CodeGenerators/WrapperGenerator.cpp b/Libraries/LibWeb/CodeGenerators/WrapperGenerator.cpp index f414c0e85a..3a111159f3 100644 --- a/Libraries/LibWeb/CodeGenerators/WrapperGenerator.cpp +++ b/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>"; diff --git a/Libraries/LibWeb/DOM/Document.cpp b/Libraries/LibWeb/DOM/Document.cpp index 282531f4fb..c207e55de8 100644 --- a/Libraries/LibWeb/DOM/Document.cpp +++ b/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> diff --git a/Libraries/LibWeb/DOM/ElementFactory.cpp b/Libraries/LibWeb/DOM/ElementFactory.cpp index 5349fb9fb6..5b5269de34 100644 --- a/Libraries/LibWeb/DOM/ElementFactory.cpp +++ b/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> diff --git a/Libraries/LibWeb/DOM/Node.cpp b/Libraries/LibWeb/DOM/Node.cpp index 7c72764d4e..fe03ed2cb6 100644 --- a/Libraries/LibWeb/DOM/Node.cpp +++ b/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> diff --git a/Libraries/LibWeb/Frame/EventHandler.cpp b/Libraries/LibWeb/Frame/EventHandler.cpp index 22fc62b434..11f461a46f 100644 --- a/Libraries/LibWeb/Frame/EventHandler.cpp +++ b/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> diff --git a/Libraries/LibWeb/Frame/Frame.cpp b/Libraries/LibWeb/Frame/Frame.cpp index b36c2ba2dd..4faef43d49 100644 --- a/Libraries/LibWeb/Frame/Frame.cpp +++ b/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> diff --git a/Libraries/LibWeb/DOM/CanvasRenderingContext2D.cpp b/Libraries/LibWeb/HTML/CanvasRenderingContext2D.cpp index a56ac222e7..5ae760c97d 100644 --- a/Libraries/LibWeb/DOM/CanvasRenderingContext2D.cpp +++ b/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 { diff --git a/Libraries/LibWeb/DOM/CanvasRenderingContext2D.h b/Libraries/LibWeb/HTML/CanvasRenderingContext2D.h index eee5804897..eee5804897 100644 --- a/Libraries/LibWeb/DOM/CanvasRenderingContext2D.h +++ b/Libraries/LibWeb/HTML/CanvasRenderingContext2D.h diff --git a/Libraries/LibWeb/DOM/CanvasRenderingContext2D.idl b/Libraries/LibWeb/HTML/CanvasRenderingContext2D.idl index 2aad0f8027..2aad0f8027 100644 --- a/Libraries/LibWeb/DOM/CanvasRenderingContext2D.idl +++ b/Libraries/LibWeb/HTML/CanvasRenderingContext2D.idl diff --git a/Libraries/LibWeb/DOM/HTMLAnchorElement.cpp b/Libraries/LibWeb/HTML/HTMLAnchorElement.cpp index 10bd11de7d..4d014bd5e8 100644 --- a/Libraries/LibWeb/DOM/HTMLAnchorElement.cpp +++ b/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 { diff --git a/Libraries/LibWeb/DOM/HTMLAnchorElement.h b/Libraries/LibWeb/HTML/HTMLAnchorElement.h index c7179b8087..a7973040a1 100644 --- a/Libraries/LibWeb/DOM/HTMLAnchorElement.h +++ b/Libraries/LibWeb/HTML/HTMLAnchorElement.h @@ -26,7 +26,7 @@ #pragma once -#include <LibWeb/DOM/HTMLElement.h> +#include <LibWeb/HTML/HTMLElement.h> namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLBRElement.cpp b/Libraries/LibWeb/HTML/HTMLBRElement.cpp index 6763bb7b38..b4f7f1ac64 100644 --- a/Libraries/LibWeb/DOM/HTMLBRElement.cpp +++ b/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 { diff --git a/Libraries/LibWeb/DOM/HTMLBRElement.h b/Libraries/LibWeb/HTML/HTMLBRElement.h index 1c86024df4..7d2aa8ffd3 100644 --- a/Libraries/LibWeb/DOM/HTMLBRElement.h +++ b/Libraries/LibWeb/HTML/HTMLBRElement.h @@ -26,7 +26,7 @@ #pragma once -#include <LibWeb/DOM/HTMLElement.h> +#include <LibWeb/HTML/HTMLElement.h> namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLBlinkElement.cpp b/Libraries/LibWeb/HTML/HTMLBlinkElement.cpp index f1ffb40238..f3aeaae58e 100644 --- a/Libraries/LibWeb/DOM/HTMLBlinkElement.cpp +++ b/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 { diff --git a/Libraries/LibWeb/DOM/HTMLBlinkElement.h b/Libraries/LibWeb/HTML/HTMLBlinkElement.h index 6696f2cae3..23773a4bc2 100644 --- a/Libraries/LibWeb/DOM/HTMLBlinkElement.h +++ b/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 { diff --git a/Libraries/LibWeb/DOM/HTMLBodyElement.cpp b/Libraries/LibWeb/HTML/HTMLBodyElement.cpp index 1dd96a4341..80ae2f73e7 100644 --- a/Libraries/LibWeb/DOM/HTMLBodyElement.cpp +++ b/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 { diff --git a/Libraries/LibWeb/DOM/HTMLBodyElement.h b/Libraries/LibWeb/HTML/HTMLBodyElement.h index bc0688d89e..4c872cefda 100644 --- a/Libraries/LibWeb/DOM/HTMLBodyElement.h +++ b/Libraries/LibWeb/HTML/HTMLBodyElement.h @@ -26,7 +26,7 @@ #pragma once -#include <LibWeb/DOM/HTMLElement.h> +#include <LibWeb/HTML/HTMLElement.h> namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLCanvasElement.cpp b/Libraries/LibWeb/HTML/HTMLCanvasElement.cpp index 8454861af3..3522733d3e 100644 --- a/Libraries/LibWeb/DOM/HTMLCanvasElement.cpp +++ b/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 { diff --git a/Libraries/LibWeb/DOM/HTMLCanvasElement.h b/Libraries/LibWeb/HTML/HTMLCanvasElement.h index dd9e3f41ec..b074d01452 100644 --- a/Libraries/LibWeb/DOM/HTMLCanvasElement.h +++ b/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 { diff --git a/Libraries/LibWeb/DOM/HTMLCanvasElement.idl b/Libraries/LibWeb/HTML/HTMLCanvasElement.idl index 2e65d3aba6..2e65d3aba6 100644 --- a/Libraries/LibWeb/DOM/HTMLCanvasElement.idl +++ b/Libraries/LibWeb/HTML/HTMLCanvasElement.idl diff --git a/Libraries/LibWeb/DOM/HTMLElement.cpp b/Libraries/LibWeb/HTML/HTMLElement.cpp index 6f52f4e807..e3148f4c71 100644 --- a/Libraries/LibWeb/DOM/HTMLElement.cpp +++ b/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 { diff --git a/Libraries/LibWeb/DOM/HTMLElement.h b/Libraries/LibWeb/HTML/HTMLElement.h index 3323f7e821..3323f7e821 100644 --- a/Libraries/LibWeb/DOM/HTMLElement.h +++ b/Libraries/LibWeb/HTML/HTMLElement.h diff --git a/Libraries/LibWeb/DOM/HTMLElement.idl b/Libraries/LibWeb/HTML/HTMLElement.idl index c47721cd8a..c47721cd8a 100644 --- a/Libraries/LibWeb/DOM/HTMLElement.idl +++ b/Libraries/LibWeb/HTML/HTMLElement.idl diff --git a/Libraries/LibWeb/DOM/HTMLFontElement.cpp b/Libraries/LibWeb/HTML/HTMLFontElement.cpp index 52521d01c4..adb0a52285 100644 --- a/Libraries/LibWeb/DOM/HTMLFontElement.cpp +++ b/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 { diff --git a/Libraries/LibWeb/DOM/HTMLFontElement.h b/Libraries/LibWeb/HTML/HTMLFontElement.h index 15da127d47..9397f757ca 100644 --- a/Libraries/LibWeb/DOM/HTMLFontElement.h +++ b/Libraries/LibWeb/HTML/HTMLFontElement.h @@ -26,7 +26,7 @@ #pragma once -#include <LibWeb/DOM/HTMLElement.h> +#include <LibWeb/HTML/HTMLElement.h> namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLFormElement.cpp b/Libraries/LibWeb/HTML/HTMLFormElement.cpp index 397391331a..e63ad4bcda 100644 --- a/Libraries/LibWeb/DOM/HTMLFormElement.cpp +++ b/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> diff --git a/Libraries/LibWeb/DOM/HTMLFormElement.h b/Libraries/LibWeb/HTML/HTMLFormElement.h index 5986653ea6..056d6095ac 100644 --- a/Libraries/LibWeb/DOM/HTMLFormElement.h +++ b/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 { diff --git a/Libraries/LibWeb/DOM/HTMLHRElement.cpp b/Libraries/LibWeb/HTML/HTMLHRElement.cpp index 88867b9b6c..d1458ea299 100644 --- a/Libraries/LibWeb/DOM/HTMLHRElement.cpp +++ b/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 { diff --git a/Libraries/LibWeb/DOM/HTMLHRElement.h b/Libraries/LibWeb/HTML/HTMLHRElement.h index 3e8f84e71a..04d2cbe217 100644 --- a/Libraries/LibWeb/DOM/HTMLHRElement.h +++ b/Libraries/LibWeb/HTML/HTMLHRElement.h @@ -26,7 +26,7 @@ #pragma once -#include <LibWeb/DOM/HTMLElement.h> +#include <LibWeb/HTML/HTMLElement.h> namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLHeadElement.cpp b/Libraries/LibWeb/HTML/HTMLHeadElement.cpp index 3b703b88d3..5331177ebf 100644 --- a/Libraries/LibWeb/DOM/HTMLHeadElement.cpp +++ b/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 { diff --git a/Libraries/LibWeb/DOM/HTMLHeadElement.h b/Libraries/LibWeb/HTML/HTMLHeadElement.h index fb4661605e..9498749c32 100644 --- a/Libraries/LibWeb/DOM/HTMLHeadElement.h +++ b/Libraries/LibWeb/HTML/HTMLHeadElement.h @@ -26,7 +26,7 @@ #pragma once -#include <LibWeb/DOM/HTMLElement.h> +#include <LibWeb/HTML/HTMLElement.h> namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLHeadingElement.cpp b/Libraries/LibWeb/HTML/HTMLHeadingElement.cpp index 7e66054499..1ab6aeef3d 100644 --- a/Libraries/LibWeb/DOM/HTMLHeadingElement.cpp +++ b/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 { diff --git a/Libraries/LibWeb/DOM/HTMLHeadingElement.h b/Libraries/LibWeb/HTML/HTMLHeadingElement.h index d2372c14c2..c8f2617160 100644 --- a/Libraries/LibWeb/DOM/HTMLHeadingElement.h +++ b/Libraries/LibWeb/HTML/HTMLHeadingElement.h @@ -26,7 +26,7 @@ #pragma once -#include <LibWeb/DOM/HTMLElement.h> +#include <LibWeb/HTML/HTMLElement.h> namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLHtmlElement.cpp b/Libraries/LibWeb/HTML/HTMLHtmlElement.cpp index 7565dccd44..4ee10a5850 100644 --- a/Libraries/LibWeb/DOM/HTMLHtmlElement.cpp +++ b/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 { diff --git a/Libraries/LibWeb/DOM/HTMLHtmlElement.h b/Libraries/LibWeb/HTML/HTMLHtmlElement.h index c57815c4cc..85996a51ba 100644 --- a/Libraries/LibWeb/DOM/HTMLHtmlElement.h +++ b/Libraries/LibWeb/HTML/HTMLHtmlElement.h @@ -26,7 +26,7 @@ #pragma once -#include <LibWeb/DOM/HTMLElement.h> +#include <LibWeb/HTML/HTMLElement.h> namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLIFrameElement.cpp b/Libraries/LibWeb/HTML/HTMLIFrameElement.cpp index fcad0465de..8925783fa7 100644 --- a/Libraries/LibWeb/DOM/HTMLIFrameElement.cpp +++ b/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> diff --git a/Libraries/LibWeb/DOM/HTMLIFrameElement.h b/Libraries/LibWeb/HTML/HTMLIFrameElement.h index 1fe26cc090..e33af818e3 100644 --- a/Libraries/LibWeb/DOM/HTMLIFrameElement.h +++ b/Libraries/LibWeb/HTML/HTMLIFrameElement.h @@ -26,7 +26,7 @@ #pragma once -#include <LibWeb/DOM/HTMLElement.h> +#include <LibWeb/HTML/HTMLElement.h> namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLImageElement.cpp b/Libraries/LibWeb/HTML/HTMLImageElement.cpp index 7c1d7e7e57..a7e545cebe 100644 --- a/Libraries/LibWeb/DOM/HTMLImageElement.cpp +++ b/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> diff --git a/Libraries/LibWeb/DOM/HTMLImageElement.h b/Libraries/LibWeb/HTML/HTMLImageElement.h index a7e0d40e68..a5625e16a5 100644 --- a/Libraries/LibWeb/DOM/HTMLImageElement.h +++ b/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 { diff --git a/Libraries/LibWeb/DOM/HTMLImageElement.idl b/Libraries/LibWeb/HTML/HTMLImageElement.idl index 4b1edafd5f..4b1edafd5f 100644 --- a/Libraries/LibWeb/DOM/HTMLImageElement.idl +++ b/Libraries/LibWeb/HTML/HTMLImageElement.idl diff --git a/Libraries/LibWeb/DOM/HTMLInputElement.cpp b/Libraries/LibWeb/HTML/HTMLInputElement.cpp index e50aaf606e..0dff7eab8d 100644 --- a/Libraries/LibWeb/DOM/HTMLInputElement.cpp +++ b/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> diff --git a/Libraries/LibWeb/DOM/HTMLInputElement.h b/Libraries/LibWeb/HTML/HTMLInputElement.h index a894efa321..f695d1355a 100644 --- a/Libraries/LibWeb/DOM/HTMLInputElement.h +++ b/Libraries/LibWeb/HTML/HTMLInputElement.h @@ -26,7 +26,7 @@ #pragma once -#include <LibWeb/DOM/HTMLElement.h> +#include <LibWeb/HTML/HTMLElement.h> namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLLinkElement.cpp b/Libraries/LibWeb/HTML/HTMLLinkElement.cpp index f82d188128..e0fb62114c 100644 --- a/Libraries/LibWeb/DOM/HTMLLinkElement.cpp +++ b/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> diff --git a/Libraries/LibWeb/DOM/HTMLLinkElement.h b/Libraries/LibWeb/HTML/HTMLLinkElement.h index d6beb03fad..57eddf3082 100644 --- a/Libraries/LibWeb/DOM/HTMLLinkElement.h +++ b/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 { diff --git a/Libraries/LibWeb/DOM/HTMLObjectElement.cpp b/Libraries/LibWeb/HTML/HTMLObjectElement.cpp index 30d928df00..e15e05c390 100644 --- a/Libraries/LibWeb/DOM/HTMLObjectElement.cpp +++ b/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> diff --git a/Libraries/LibWeb/DOM/HTMLObjectElement.h b/Libraries/LibWeb/HTML/HTMLObjectElement.h index d8caab1b38..b5711de3a9 100644 --- a/Libraries/LibWeb/DOM/HTMLObjectElement.h +++ b/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 { diff --git a/Libraries/LibWeb/DOM/HTMLScriptElement.cpp b/Libraries/LibWeb/HTML/HTMLScriptElement.cpp index 481a65cd81..38739f56f9 100644 --- a/Libraries/LibWeb/DOM/HTMLScriptElement.cpp +++ b/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> diff --git a/Libraries/LibWeb/DOM/HTMLScriptElement.h b/Libraries/LibWeb/HTML/HTMLScriptElement.h index b9fbb57d92..0b056eb18b 100644 --- a/Libraries/LibWeb/DOM/HTMLScriptElement.h +++ b/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 { diff --git a/Libraries/LibWeb/DOM/HTMLStyleElement.cpp b/Libraries/LibWeb/HTML/HTMLStyleElement.cpp index 0ab7a6be20..c90a8eede9 100644 --- a/Libraries/LibWeb/DOM/HTMLStyleElement.cpp +++ b/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> diff --git a/Libraries/LibWeb/DOM/HTMLStyleElement.h b/Libraries/LibWeb/HTML/HTMLStyleElement.h index efe6c89ecb..390c60dab1 100644 --- a/Libraries/LibWeb/DOM/HTMLStyleElement.h +++ b/Libraries/LibWeb/HTML/HTMLStyleElement.h @@ -26,7 +26,7 @@ #pragma once -#include <LibWeb/DOM/HTMLElement.h> +#include <LibWeb/HTML/HTMLElement.h> namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLTableCellElement.cpp b/Libraries/LibWeb/HTML/HTMLTableCellElement.cpp index 3154acc55f..98beb030bb 100644 --- a/Libraries/LibWeb/DOM/HTMLTableCellElement.cpp +++ b/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 { diff --git a/Libraries/LibWeb/DOM/HTMLTableCellElement.h b/Libraries/LibWeb/HTML/HTMLTableCellElement.h index 8d1f2d90f6..09c11e059d 100644 --- a/Libraries/LibWeb/DOM/HTMLTableCellElement.h +++ b/Libraries/LibWeb/HTML/HTMLTableCellElement.h @@ -26,7 +26,7 @@ #pragma once -#include <LibWeb/DOM/HTMLElement.h> +#include <LibWeb/HTML/HTMLElement.h> namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLTableElement.cpp b/Libraries/LibWeb/HTML/HTMLTableElement.cpp index e337f3eda5..fabc7eb121 100644 --- a/Libraries/LibWeb/DOM/HTMLTableElement.cpp +++ b/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 { diff --git a/Libraries/LibWeb/DOM/HTMLTableElement.h b/Libraries/LibWeb/HTML/HTMLTableElement.h index 777a6f96f5..3a664ba42d 100644 --- a/Libraries/LibWeb/DOM/HTMLTableElement.h +++ b/Libraries/LibWeb/HTML/HTMLTableElement.h @@ -26,7 +26,7 @@ #pragma once -#include <LibWeb/DOM/HTMLElement.h> +#include <LibWeb/HTML/HTMLElement.h> namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLTableRowElement.cpp b/Libraries/LibWeb/HTML/HTMLTableRowElement.cpp index b14464d33d..aff8ac5204 100644 --- a/Libraries/LibWeb/DOM/HTMLTableRowElement.cpp +++ b/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 { diff --git a/Libraries/LibWeb/DOM/HTMLTableRowElement.h b/Libraries/LibWeb/HTML/HTMLTableRowElement.h index 3940e1b02d..0eebd6d36c 100644 --- a/Libraries/LibWeb/DOM/HTMLTableRowElement.h +++ b/Libraries/LibWeb/HTML/HTMLTableRowElement.h @@ -26,7 +26,7 @@ #pragma once -#include <LibWeb/DOM/HTMLElement.h> +#include <LibWeb/HTML/HTMLElement.h> namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLTitleElement.cpp b/Libraries/LibWeb/HTML/HTMLTitleElement.cpp index a56b1795ac..398694504c 100644 --- a/Libraries/LibWeb/DOM/HTMLTitleElement.cpp +++ b/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 { diff --git a/Libraries/LibWeb/DOM/HTMLTitleElement.h b/Libraries/LibWeb/HTML/HTMLTitleElement.h index b162d24341..8bf1aaf97d 100644 --- a/Libraries/LibWeb/DOM/HTMLTitleElement.h +++ b/Libraries/LibWeb/HTML/HTMLTitleElement.h @@ -26,7 +26,7 @@ #pragma once -#include <LibWeb/DOM/HTMLElement.h> +#include <LibWeb/HTML/HTMLElement.h> namespace Web { diff --git a/Libraries/LibWeb/DOM/ImageData.cpp b/Libraries/LibWeb/HTML/ImageData.cpp index 80f533e68b..064ffc5ae0 100644 --- a/Libraries/LibWeb/DOM/ImageData.cpp +++ b/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 { diff --git a/Libraries/LibWeb/DOM/ImageData.h b/Libraries/LibWeb/HTML/ImageData.h index 493e0517a8..493e0517a8 100644 --- a/Libraries/LibWeb/DOM/ImageData.h +++ b/Libraries/LibWeb/HTML/ImageData.h diff --git a/Libraries/LibWeb/DOM/ImageData.idl b/Libraries/LibWeb/HTML/ImageData.idl index b5e4069808..b5e4069808 100644 --- a/Libraries/LibWeb/DOM/ImageData.idl +++ b/Libraries/LibWeb/HTML/ImageData.idl diff --git a/Libraries/LibWeb/Layout/LayoutBox.cpp b/Libraries/LibWeb/Layout/LayoutBox.cpp index 4e84d22324..25c6c34e57 100644 --- a/Libraries/LibWeb/Layout/LayoutBox.cpp +++ b/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> diff --git a/Libraries/LibWeb/Layout/LayoutBreak.h b/Libraries/LibWeb/Layout/LayoutBreak.h index 6f6b930367..1d52acaf4c 100644 --- a/Libraries/LibWeb/Layout/LayoutBreak.h +++ b/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 { diff --git a/Libraries/LibWeb/Layout/LayoutCanvas.h b/Libraries/LibWeb/Layout/LayoutCanvas.h index 74aefe5754..1808e21786 100644 --- a/Libraries/LibWeb/Layout/LayoutCanvas.h +++ b/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 { diff --git a/Libraries/LibWeb/Layout/LayoutFrame.h b/Libraries/LibWeb/Layout/LayoutFrame.h index 56f84cb188..10f5d62b6b 100644 --- a/Libraries/LibWeb/Layout/LayoutFrame.h +++ b/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 { diff --git a/Libraries/LibWeb/Layout/LayoutImage.h b/Libraries/LibWeb/Layout/LayoutImage.h index 81871246b8..7e639fda2b 100644 --- a/Libraries/LibWeb/Layout/LayoutImage.h +++ b/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 { diff --git a/Libraries/LibWeb/Loader/Resource.cpp b/Libraries/LibWeb/Loader/Resource.cpp index 4fd93de1b7..99381eaff0 100644 --- a/Libraries/LibWeb/Loader/Resource.cpp +++ b/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 { diff --git a/Libraries/LibWeb/PageView.cpp b/Libraries/LibWeb/PageView.cpp index c4ea156190..fbf49d8770 100644 --- a/Libraries/LibWeb/PageView.cpp +++ b/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> diff --git a/Libraries/LibWeb/Parser/HTMLDocumentParser.cpp b/Libraries/LibWeb/Parser/HTMLDocumentParser.cpp index 1ab8f14d1e..c360b1f8e1 100644 --- a/Libraries/LibWeb/Parser/HTMLDocumentParser.cpp +++ b/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> diff --git a/Libraries/LibWeb/SVG/SVGPathElement.h b/Libraries/LibWeb/SVG/SVGPathElement.h index ad17d1780d..8aeed96559 100644 --- a/Libraries/LibWeb/SVG/SVGPathElement.h +++ b/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 { |