diff --git a/Applications/Browser/BrowserConsoleClient.cpp b/Applications/Browser/BrowserConsoleClient.cpp index 3c121c48da2..4edaef346cc 100644 --- a/Applications/Browser/BrowserConsoleClient.cpp +++ b/Applications/Browser/BrowserConsoleClient.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include diff --git a/Applications/Browser/ConsoleWidget.cpp b/Applications/Browser/ConsoleWidget.cpp index c14e6183c82..a8863819aec 100644 --- a/Applications/Browser/ConsoleWidget.cpp +++ b/Applications/Browser/ConsoleWidget.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include diff --git a/Applications/IRCClient/IRCLogBuffer.cpp b/Applications/IRCClient/IRCLogBuffer.cpp index 8904cca8df9..730b4d3b4ae 100644 --- a/Applications/IRCClient/IRCLogBuffer.cpp +++ b/Applications/IRCClient/IRCLogBuffer.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/DevTools/HackStudio/Editor.cpp b/DevTools/HackStudio/Editor.cpp index ebe5b35cc15..18638564cbe 100644 --- a/DevTools/HackStudio/Editor.cpp +++ b/DevTools/HackStudio/Editor.cpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include diff --git a/Libraries/LibWeb/Bindings/NodeWrapperFactory.cpp b/Libraries/LibWeb/Bindings/NodeWrapperFactory.cpp index d102fc64040..576deeaa118 100644 --- a/Libraries/LibWeb/Bindings/NodeWrapperFactory.cpp +++ b/Libraries/LibWeb/Bindings/NodeWrapperFactory.cpp @@ -31,8 +31,8 @@ #include #include #include -#include -#include +#include +#include #include namespace Web { diff --git a/Libraries/LibWeb/CMakeLists.txt b/Libraries/LibWeb/CMakeLists.txt index 8c3081faa78..24be8f4c352 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 e71cffda40c..76d9b55ecc4 100644 --- a/Libraries/LibWeb/CSS/Length.cpp +++ b/Libraries/LibWeb/CSS/Length.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include namespace Web { diff --git a/Libraries/LibWeb/CodeGenerators/WrapperGenerator.cpp b/Libraries/LibWeb/CodeGenerators/WrapperGenerator.cpp index f414c0e85ad..3a111159f36 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 "; + + // FIXME: This is very strange. + out() << "#if __has_include()"; out() << "#include "; + out() << "#else"; + out() << "#include "; + out() << "#endif"; if (wrapper_base_class != "Wrapper") out() << "#include "; @@ -459,7 +465,7 @@ void generate_implementation(const IDL::Interface& interface) out() << "#include "; out() << "#include "; out() << "#include "; - out() << "#include "; + out() << "#include "; out() << "#include "; out() << "#include "; out() << "#include "; diff --git a/Libraries/LibWeb/DOM/Document.cpp b/Libraries/LibWeb/DOM/Document.cpp index 282531f4fb2..c207e55de86 100644 --- a/Libraries/LibWeb/DOM/Document.cpp +++ b/Libraries/LibWeb/DOM/Document.cpp @@ -42,11 +42,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/Libraries/LibWeb/DOM/ElementFactory.cpp b/Libraries/LibWeb/DOM/ElementFactory.cpp index 5349fb9fb6e..5b5269de342 100644 --- a/Libraries/LibWeb/DOM/ElementFactory.cpp +++ b/Libraries/LibWeb/DOM/ElementFactory.cpp @@ -25,28 +25,28 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/Libraries/LibWeb/DOM/Node.cpp b/Libraries/LibWeb/DOM/Node.cpp index 7c72764d4e8..fe03ed2cb6d 100644 --- a/Libraries/LibWeb/DOM/Node.cpp +++ b/Libraries/LibWeb/DOM/Node.cpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Libraries/LibWeb/Frame/EventHandler.cpp b/Libraries/LibWeb/Frame/EventHandler.cpp index 22fc62b434e..11f461a46fa 100644 --- a/Libraries/LibWeb/Frame/EventHandler.cpp +++ b/Libraries/LibWeb/Frame/EventHandler.cpp @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/Libraries/LibWeb/Frame/Frame.cpp b/Libraries/LibWeb/Frame/Frame.cpp index b36c2ba2dd5..4faef43d497 100644 --- a/Libraries/LibWeb/Frame/Frame.cpp +++ b/Libraries/LibWeb/Frame/Frame.cpp @@ -25,7 +25,7 @@ */ #include -#include +#include #include #include #include diff --git a/Libraries/LibWeb/DOM/CanvasRenderingContext2D.cpp b/Libraries/LibWeb/HTML/CanvasRenderingContext2D.cpp similarity index 97% rename from Libraries/LibWeb/DOM/CanvasRenderingContext2D.cpp rename to Libraries/LibWeb/HTML/CanvasRenderingContext2D.cpp index a56ac222e76..5ae760c97d9 100644 --- a/Libraries/LibWeb/DOM/CanvasRenderingContext2D.cpp +++ b/Libraries/LibWeb/HTML/CanvasRenderingContext2D.cpp @@ -27,10 +27,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/CanvasRenderingContext2D.h b/Libraries/LibWeb/HTML/CanvasRenderingContext2D.h similarity index 100% rename from Libraries/LibWeb/DOM/CanvasRenderingContext2D.h rename to Libraries/LibWeb/HTML/CanvasRenderingContext2D.h diff --git a/Libraries/LibWeb/DOM/CanvasRenderingContext2D.idl b/Libraries/LibWeb/HTML/CanvasRenderingContext2D.idl similarity index 100% rename from Libraries/LibWeb/DOM/CanvasRenderingContext2D.idl rename to Libraries/LibWeb/HTML/CanvasRenderingContext2D.idl diff --git a/Libraries/LibWeb/DOM/HTMLAnchorElement.cpp b/Libraries/LibWeb/HTML/HTMLAnchorElement.cpp similarity index 97% rename from Libraries/LibWeb/DOM/HTMLAnchorElement.cpp rename to Libraries/LibWeb/HTML/HTMLAnchorElement.cpp index 10bd11de7d6..4d014bd5e80 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 +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLAnchorElement.h b/Libraries/LibWeb/HTML/HTMLAnchorElement.h similarity index 98% rename from Libraries/LibWeb/DOM/HTMLAnchorElement.h rename to Libraries/LibWeb/HTML/HTMLAnchorElement.h index c7179b80871..a7973040a1f 100644 --- a/Libraries/LibWeb/DOM/HTMLAnchorElement.h +++ b/Libraries/LibWeb/HTML/HTMLAnchorElement.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLBRElement.cpp b/Libraries/LibWeb/HTML/HTMLBRElement.cpp similarity index 97% rename from Libraries/LibWeb/DOM/HTMLBRElement.cpp rename to Libraries/LibWeb/HTML/HTMLBRElement.cpp index 6763bb7b383..b4f7f1ac645 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 +#include #include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLBRElement.h b/Libraries/LibWeb/HTML/HTMLBRElement.h similarity index 98% rename from Libraries/LibWeb/DOM/HTMLBRElement.h rename to Libraries/LibWeb/HTML/HTMLBRElement.h index 1c86024df4a..7d2aa8ffd34 100644 --- a/Libraries/LibWeb/DOM/HTMLBRElement.h +++ b/Libraries/LibWeb/HTML/HTMLBRElement.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLBlinkElement.cpp b/Libraries/LibWeb/HTML/HTMLBlinkElement.cpp similarity index 97% rename from Libraries/LibWeb/DOM/HTMLBlinkElement.cpp rename to Libraries/LibWeb/HTML/HTMLBlinkElement.cpp index f1ffb402388..f3aeaae58ea 100644 --- a/Libraries/LibWeb/DOM/HTMLBlinkElement.cpp +++ b/Libraries/LibWeb/HTML/HTMLBlinkElement.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLBlinkElement.h b/Libraries/LibWeb/HTML/HTMLBlinkElement.h similarity index 98% rename from Libraries/LibWeb/DOM/HTMLBlinkElement.h rename to Libraries/LibWeb/HTML/HTMLBlinkElement.h index 6696f2cae37..23773a4bc2e 100644 --- a/Libraries/LibWeb/DOM/HTMLBlinkElement.h +++ b/Libraries/LibWeb/HTML/HTMLBlinkElement.h @@ -27,7 +27,7 @@ #pragma once #include -#include +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLBodyElement.cpp b/Libraries/LibWeb/HTML/HTMLBodyElement.cpp similarity index 98% rename from Libraries/LibWeb/DOM/HTMLBodyElement.cpp rename to Libraries/LibWeb/HTML/HTMLBodyElement.cpp index 1dd96a43412..80ae2f73e78 100644 --- a/Libraries/LibWeb/DOM/HTMLBodyElement.cpp +++ b/Libraries/LibWeb/HTML/HTMLBodyElement.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLBodyElement.h b/Libraries/LibWeb/HTML/HTMLBodyElement.h similarity index 98% rename from Libraries/LibWeb/DOM/HTMLBodyElement.h rename to Libraries/LibWeb/HTML/HTMLBodyElement.h index bc0688d89ea..4c872cefdaa 100644 --- a/Libraries/LibWeb/DOM/HTMLBodyElement.h +++ b/Libraries/LibWeb/HTML/HTMLBodyElement.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLCanvasElement.cpp b/Libraries/LibWeb/HTML/HTMLCanvasElement.cpp similarity index 97% rename from Libraries/LibWeb/DOM/HTMLCanvasElement.cpp rename to Libraries/LibWeb/HTML/HTMLCanvasElement.cpp index 8454861af3b..3522733d3e7 100644 --- a/Libraries/LibWeb/DOM/HTMLCanvasElement.cpp +++ b/Libraries/LibWeb/HTML/HTMLCanvasElement.cpp @@ -27,9 +27,9 @@ #include #include #include -#include #include -#include +#include +#include #include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLCanvasElement.h b/Libraries/LibWeb/HTML/HTMLCanvasElement.h similarity index 98% rename from Libraries/LibWeb/DOM/HTMLCanvasElement.h rename to Libraries/LibWeb/HTML/HTMLCanvasElement.h index dd9e3f41ec0..b074d01452f 100644 --- a/Libraries/LibWeb/DOM/HTMLCanvasElement.h +++ b/Libraries/LibWeb/HTML/HTMLCanvasElement.h @@ -28,7 +28,7 @@ #include #include -#include +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLCanvasElement.idl b/Libraries/LibWeb/HTML/HTMLCanvasElement.idl similarity index 100% rename from Libraries/LibWeb/DOM/HTMLCanvasElement.idl rename to Libraries/LibWeb/HTML/HTMLCanvasElement.idl diff --git a/Libraries/LibWeb/DOM/HTMLElement.cpp b/Libraries/LibWeb/HTML/HTMLElement.cpp similarity index 97% rename from Libraries/LibWeb/DOM/HTMLElement.cpp rename to Libraries/LibWeb/HTML/HTMLElement.cpp index 6f52f4e8078..e3148f4c71b 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 +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLElement.h b/Libraries/LibWeb/HTML/HTMLElement.h similarity index 100% rename from Libraries/LibWeb/DOM/HTMLElement.h rename to Libraries/LibWeb/HTML/HTMLElement.h diff --git a/Libraries/LibWeb/DOM/HTMLElement.idl b/Libraries/LibWeb/HTML/HTMLElement.idl similarity index 100% rename from Libraries/LibWeb/DOM/HTMLElement.idl rename to Libraries/LibWeb/HTML/HTMLElement.idl diff --git a/Libraries/LibWeb/DOM/HTMLFontElement.cpp b/Libraries/LibWeb/HTML/HTMLFontElement.cpp similarity index 98% rename from Libraries/LibWeb/DOM/HTMLFontElement.cpp rename to Libraries/LibWeb/HTML/HTMLFontElement.cpp index 52521d01c42..adb0a522851 100644 --- a/Libraries/LibWeb/DOM/HTMLFontElement.cpp +++ b/Libraries/LibWeb/HTML/HTMLFontElement.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLFontElement.h b/Libraries/LibWeb/HTML/HTMLFontElement.h similarity index 98% rename from Libraries/LibWeb/DOM/HTMLFontElement.h rename to Libraries/LibWeb/HTML/HTMLFontElement.h index 15da127d47a..9397f757ca5 100644 --- a/Libraries/LibWeb/DOM/HTMLFontElement.h +++ b/Libraries/LibWeb/HTML/HTMLFontElement.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLFormElement.cpp b/Libraries/LibWeb/HTML/HTMLFormElement.cpp similarity index 97% rename from Libraries/LibWeb/DOM/HTMLFormElement.cpp rename to Libraries/LibWeb/HTML/HTMLFormElement.cpp index 397391331a8..e63ad4bcdaf 100644 --- a/Libraries/LibWeb/DOM/HTMLFormElement.cpp +++ b/Libraries/LibWeb/HTML/HTMLFormElement.cpp @@ -25,8 +25,8 @@ */ #include -#include -#include +#include +#include #include #include #include diff --git a/Libraries/LibWeb/DOM/HTMLFormElement.h b/Libraries/LibWeb/HTML/HTMLFormElement.h similarity index 96% rename from Libraries/LibWeb/DOM/HTMLFormElement.h rename to Libraries/LibWeb/HTML/HTMLFormElement.h index 5986653ea62..056d6095ac7 100644 --- a/Libraries/LibWeb/DOM/HTMLFormElement.h +++ b/Libraries/LibWeb/HTML/HTMLFormElement.h @@ -26,8 +26,8 @@ #pragma once -#include -#include +#include +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLHRElement.cpp b/Libraries/LibWeb/HTML/HTMLHRElement.cpp similarity index 97% rename from Libraries/LibWeb/DOM/HTMLHRElement.cpp rename to Libraries/LibWeb/HTML/HTMLHRElement.cpp index 88867b9b6cb..d1458ea2990 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 +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLHRElement.h b/Libraries/LibWeb/HTML/HTMLHRElement.h similarity index 97% rename from Libraries/LibWeb/DOM/HTMLHRElement.h rename to Libraries/LibWeb/HTML/HTMLHRElement.h index 3e8f84e71a7..04d2cbe2175 100644 --- a/Libraries/LibWeb/DOM/HTMLHRElement.h +++ b/Libraries/LibWeb/HTML/HTMLHRElement.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLHeadElement.cpp b/Libraries/LibWeb/HTML/HTMLHeadElement.cpp similarity index 97% rename from Libraries/LibWeb/DOM/HTMLHeadElement.cpp rename to Libraries/LibWeb/HTML/HTMLHeadElement.cpp index 3b703b88d33..5331177ebff 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 +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLHeadElement.h b/Libraries/LibWeb/HTML/HTMLHeadElement.h similarity index 97% rename from Libraries/LibWeb/DOM/HTMLHeadElement.h rename to Libraries/LibWeb/HTML/HTMLHeadElement.h index fb4661605eb..9498749c324 100644 --- a/Libraries/LibWeb/DOM/HTMLHeadElement.h +++ b/Libraries/LibWeb/HTML/HTMLHeadElement.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLHeadingElement.cpp b/Libraries/LibWeb/HTML/HTMLHeadingElement.cpp similarity index 97% rename from Libraries/LibWeb/DOM/HTMLHeadingElement.cpp rename to Libraries/LibWeb/HTML/HTMLHeadingElement.cpp index 7e66054499c..1ab6aeef3d6 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 +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLHeadingElement.h b/Libraries/LibWeb/HTML/HTMLHeadingElement.h similarity index 97% rename from Libraries/LibWeb/DOM/HTMLHeadingElement.h rename to Libraries/LibWeb/HTML/HTMLHeadingElement.h index d2372c14c28..c8f2617160d 100644 --- a/Libraries/LibWeb/DOM/HTMLHeadingElement.h +++ b/Libraries/LibWeb/HTML/HTMLHeadingElement.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLHtmlElement.cpp b/Libraries/LibWeb/HTML/HTMLHtmlElement.cpp similarity index 97% rename from Libraries/LibWeb/DOM/HTMLHtmlElement.cpp rename to Libraries/LibWeb/HTML/HTMLHtmlElement.cpp index 7565dccd443..4ee10a58501 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 +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLHtmlElement.h b/Libraries/LibWeb/HTML/HTMLHtmlElement.h similarity index 97% rename from Libraries/LibWeb/DOM/HTMLHtmlElement.h rename to Libraries/LibWeb/HTML/HTMLHtmlElement.h index c57815c4cc5..85996a51baa 100644 --- a/Libraries/LibWeb/DOM/HTMLHtmlElement.h +++ b/Libraries/LibWeb/HTML/HTMLHtmlElement.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLIFrameElement.cpp b/Libraries/LibWeb/HTML/HTMLIFrameElement.cpp similarity index 97% rename from Libraries/LibWeb/DOM/HTMLIFrameElement.cpp rename to Libraries/LibWeb/HTML/HTMLIFrameElement.cpp index fcad0465def..8925783fa75 100644 --- a/Libraries/LibWeb/DOM/HTMLIFrameElement.cpp +++ b/Libraries/LibWeb/HTML/HTMLIFrameElement.cpp @@ -29,8 +29,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/Libraries/LibWeb/DOM/HTMLIFrameElement.h b/Libraries/LibWeb/HTML/HTMLIFrameElement.h similarity index 98% rename from Libraries/LibWeb/DOM/HTMLIFrameElement.h rename to Libraries/LibWeb/HTML/HTMLIFrameElement.h index 1fe26cc0902..e33af818e3d 100644 --- a/Libraries/LibWeb/DOM/HTMLIFrameElement.h +++ b/Libraries/LibWeb/HTML/HTMLIFrameElement.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLImageElement.cpp b/Libraries/LibWeb/HTML/HTMLImageElement.cpp similarity index 98% rename from Libraries/LibWeb/DOM/HTMLImageElement.cpp rename to Libraries/LibWeb/HTML/HTMLImageElement.cpp index 7c1d7e7e57d..a7e545cebec 100644 --- a/Libraries/LibWeb/DOM/HTMLImageElement.cpp +++ b/Libraries/LibWeb/HTML/HTMLImageElement.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Libraries/LibWeb/DOM/HTMLImageElement.h b/Libraries/LibWeb/HTML/HTMLImageElement.h similarity index 98% rename from Libraries/LibWeb/DOM/HTMLImageElement.h rename to Libraries/LibWeb/HTML/HTMLImageElement.h index a7e0d40e682..a5625e16a57 100644 --- a/Libraries/LibWeb/DOM/HTMLImageElement.h +++ b/Libraries/LibWeb/HTML/HTMLImageElement.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLImageElement.idl b/Libraries/LibWeb/HTML/HTMLImageElement.idl similarity index 100% rename from Libraries/LibWeb/DOM/HTMLImageElement.idl rename to Libraries/LibWeb/HTML/HTMLImageElement.idl diff --git a/Libraries/LibWeb/DOM/HTMLInputElement.cpp b/Libraries/LibWeb/HTML/HTMLInputElement.cpp similarity index 98% rename from Libraries/LibWeb/DOM/HTMLInputElement.cpp rename to Libraries/LibWeb/HTML/HTMLInputElement.cpp index e50aaf606e4..0dff7eab8d1 100644 --- a/Libraries/LibWeb/DOM/HTMLInputElement.cpp +++ b/Libraries/LibWeb/HTML/HTMLInputElement.cpp @@ -29,8 +29,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/Libraries/LibWeb/DOM/HTMLInputElement.h b/Libraries/LibWeb/HTML/HTMLInputElement.h similarity index 98% rename from Libraries/LibWeb/DOM/HTMLInputElement.h rename to Libraries/LibWeb/HTML/HTMLInputElement.h index a894efa321a..f695d1355a5 100644 --- a/Libraries/LibWeb/DOM/HTMLInputElement.h +++ b/Libraries/LibWeb/HTML/HTMLInputElement.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLLinkElement.cpp b/Libraries/LibWeb/HTML/HTMLLinkElement.cpp similarity index 98% rename from Libraries/LibWeb/DOM/HTMLLinkElement.cpp rename to Libraries/LibWeb/HTML/HTMLLinkElement.cpp index f82d1881284..e0fb62114ca 100644 --- a/Libraries/LibWeb/DOM/HTMLLinkElement.cpp +++ b/Libraries/LibWeb/HTML/HTMLLinkElement.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/Libraries/LibWeb/DOM/HTMLLinkElement.h b/Libraries/LibWeb/HTML/HTMLLinkElement.h similarity index 98% rename from Libraries/LibWeb/DOM/HTMLLinkElement.h rename to Libraries/LibWeb/HTML/HTMLLinkElement.h index d6beb03fad7..57eddf30828 100644 --- a/Libraries/LibWeb/DOM/HTMLLinkElement.h +++ b/Libraries/LibWeb/HTML/HTMLLinkElement.h @@ -26,7 +26,7 @@ #pragma once -#include +#include #include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLObjectElement.cpp b/Libraries/LibWeb/HTML/HTMLObjectElement.cpp similarity index 98% rename from Libraries/LibWeb/DOM/HTMLObjectElement.cpp rename to Libraries/LibWeb/HTML/HTMLObjectElement.cpp index 30d928df00e..e15e05c390f 100644 --- a/Libraries/LibWeb/DOM/HTMLObjectElement.cpp +++ b/Libraries/LibWeb/HTML/HTMLObjectElement.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/Libraries/LibWeb/DOM/HTMLObjectElement.h b/Libraries/LibWeb/HTML/HTMLObjectElement.h similarity index 98% rename from Libraries/LibWeb/DOM/HTMLObjectElement.h rename to Libraries/LibWeb/HTML/HTMLObjectElement.h index d8caab1b384..b5711de3a9b 100644 --- a/Libraries/LibWeb/DOM/HTMLObjectElement.h +++ b/Libraries/LibWeb/HTML/HTMLObjectElement.h @@ -28,7 +28,7 @@ #include #include -#include +#include #include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLScriptElement.cpp b/Libraries/LibWeb/HTML/HTMLScriptElement.cpp similarity index 99% rename from Libraries/LibWeb/DOM/HTMLScriptElement.cpp rename to Libraries/LibWeb/HTML/HTMLScriptElement.cpp index 481a65cd817..38739f56f9b 100644 --- a/Libraries/LibWeb/DOM/HTMLScriptElement.cpp +++ b/Libraries/LibWeb/HTML/HTMLScriptElement.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/Libraries/LibWeb/DOM/HTMLScriptElement.h b/Libraries/LibWeb/HTML/HTMLScriptElement.h similarity index 98% rename from Libraries/LibWeb/DOM/HTMLScriptElement.h rename to Libraries/LibWeb/HTML/HTMLScriptElement.h index b9fbb57d92d..0b056eb18bf 100644 --- a/Libraries/LibWeb/DOM/HTMLScriptElement.h +++ b/Libraries/LibWeb/HTML/HTMLScriptElement.h @@ -27,7 +27,7 @@ #pragma once #include -#include +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLStyleElement.cpp b/Libraries/LibWeb/HTML/HTMLStyleElement.cpp similarity index 98% rename from Libraries/LibWeb/DOM/HTMLStyleElement.cpp rename to Libraries/LibWeb/HTML/HTMLStyleElement.cpp index 0ab7a6be20b..c90a8eede9d 100644 --- a/Libraries/LibWeb/DOM/HTMLStyleElement.cpp +++ b/Libraries/LibWeb/HTML/HTMLStyleElement.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/Libraries/LibWeb/DOM/HTMLStyleElement.h b/Libraries/LibWeb/HTML/HTMLStyleElement.h similarity index 98% rename from Libraries/LibWeb/DOM/HTMLStyleElement.h rename to Libraries/LibWeb/HTML/HTMLStyleElement.h index efe6c89ecbc..390c60dab17 100644 --- a/Libraries/LibWeb/DOM/HTMLStyleElement.h +++ b/Libraries/LibWeb/HTML/HTMLStyleElement.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLTableCellElement.cpp b/Libraries/LibWeb/HTML/HTMLTableCellElement.cpp similarity index 98% rename from Libraries/LibWeb/DOM/HTMLTableCellElement.cpp rename to Libraries/LibWeb/HTML/HTMLTableCellElement.cpp index 3154acc55f7..98beb030bb1 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 +#include #include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLTableCellElement.h b/Libraries/LibWeb/HTML/HTMLTableCellElement.h similarity index 98% rename from Libraries/LibWeb/DOM/HTMLTableCellElement.h rename to Libraries/LibWeb/HTML/HTMLTableCellElement.h index 8d1f2d90f63..09c11e059d5 100644 --- a/Libraries/LibWeb/DOM/HTMLTableCellElement.h +++ b/Libraries/LibWeb/HTML/HTMLTableCellElement.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLTableElement.cpp b/Libraries/LibWeb/HTML/HTMLTableElement.cpp similarity index 98% rename from Libraries/LibWeb/DOM/HTMLTableElement.cpp rename to Libraries/LibWeb/HTML/HTMLTableElement.cpp index e337f3eda51..fabc7eb1214 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 +#include #include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLTableElement.h b/Libraries/LibWeb/HTML/HTMLTableElement.h similarity index 98% rename from Libraries/LibWeb/DOM/HTMLTableElement.h rename to Libraries/LibWeb/HTML/HTMLTableElement.h index 777a6f96f52..3a664ba42d8 100644 --- a/Libraries/LibWeb/DOM/HTMLTableElement.h +++ b/Libraries/LibWeb/HTML/HTMLTableElement.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLTableRowElement.cpp b/Libraries/LibWeb/HTML/HTMLTableRowElement.cpp similarity index 97% rename from Libraries/LibWeb/DOM/HTMLTableRowElement.cpp rename to Libraries/LibWeb/HTML/HTMLTableRowElement.cpp index b14464d33d5..aff8ac5204e 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 +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLTableRowElement.h b/Libraries/LibWeb/HTML/HTMLTableRowElement.h similarity index 97% rename from Libraries/LibWeb/DOM/HTMLTableRowElement.h rename to Libraries/LibWeb/HTML/HTMLTableRowElement.h index 3940e1b02d5..0eebd6d36cf 100644 --- a/Libraries/LibWeb/DOM/HTMLTableRowElement.h +++ b/Libraries/LibWeb/HTML/HTMLTableRowElement.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLTitleElement.cpp b/Libraries/LibWeb/HTML/HTMLTitleElement.cpp similarity index 97% rename from Libraries/LibWeb/DOM/HTMLTitleElement.cpp rename to Libraries/LibWeb/HTML/HTMLTitleElement.cpp index a56b1795ac1..398694504c4 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 +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/HTMLTitleElement.h b/Libraries/LibWeb/HTML/HTMLTitleElement.h similarity index 97% rename from Libraries/LibWeb/DOM/HTMLTitleElement.h rename to Libraries/LibWeb/HTML/HTMLTitleElement.h index b162d243410..8bf1aaf97db 100644 --- a/Libraries/LibWeb/DOM/HTMLTitleElement.h +++ b/Libraries/LibWeb/HTML/HTMLTitleElement.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/ImageData.cpp b/Libraries/LibWeb/HTML/ImageData.cpp similarity index 98% rename from Libraries/LibWeb/DOM/ImageData.cpp rename to Libraries/LibWeb/HTML/ImageData.cpp index 80f533e68b3..064ffc5ae04 100644 --- a/Libraries/LibWeb/DOM/ImageData.cpp +++ b/Libraries/LibWeb/HTML/ImageData.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include namespace Web { diff --git a/Libraries/LibWeb/DOM/ImageData.h b/Libraries/LibWeb/HTML/ImageData.h similarity index 100% rename from Libraries/LibWeb/DOM/ImageData.h rename to Libraries/LibWeb/HTML/ImageData.h diff --git a/Libraries/LibWeb/DOM/ImageData.idl b/Libraries/LibWeb/HTML/ImageData.idl similarity index 100% rename from Libraries/LibWeb/DOM/ImageData.idl rename to Libraries/LibWeb/HTML/ImageData.idl diff --git a/Libraries/LibWeb/Layout/LayoutBox.cpp b/Libraries/LibWeb/Layout/LayoutBox.cpp index 4e84d223247..25c6c34e572 100644 --- a/Libraries/LibWeb/Layout/LayoutBox.cpp +++ b/Libraries/LibWeb/Layout/LayoutBox.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/Libraries/LibWeb/Layout/LayoutBreak.h b/Libraries/LibWeb/Layout/LayoutBreak.h index 6f6b9303670..1d52acaf4cc 100644 --- a/Libraries/LibWeb/Layout/LayoutBreak.h +++ b/Libraries/LibWeb/Layout/LayoutBreak.h @@ -26,7 +26,7 @@ #pragma once -#include +#include #include namespace Web { diff --git a/Libraries/LibWeb/Layout/LayoutCanvas.h b/Libraries/LibWeb/Layout/LayoutCanvas.h index 74aefe57540..1808e217864 100644 --- a/Libraries/LibWeb/Layout/LayoutCanvas.h +++ b/Libraries/LibWeb/Layout/LayoutCanvas.h @@ -26,7 +26,7 @@ #pragma once -#include +#include #include namespace Web { diff --git a/Libraries/LibWeb/Layout/LayoutFrame.h b/Libraries/LibWeb/Layout/LayoutFrame.h index 56f84cb188e..10f5d62b6b1 100644 --- a/Libraries/LibWeb/Layout/LayoutFrame.h +++ b/Libraries/LibWeb/Layout/LayoutFrame.h @@ -27,7 +27,7 @@ #pragma once #include -#include +#include namespace Web { diff --git a/Libraries/LibWeb/Layout/LayoutImage.h b/Libraries/LibWeb/Layout/LayoutImage.h index 81871246b81..7e639fda2bb 100644 --- a/Libraries/LibWeb/Layout/LayoutImage.h +++ b/Libraries/LibWeb/Layout/LayoutImage.h @@ -26,7 +26,7 @@ #pragma once -#include +#include #include namespace Web { diff --git a/Libraries/LibWeb/Loader/Resource.cpp b/Libraries/LibWeb/Loader/Resource.cpp index 4fd93de1b7b..99381eaff09 100644 --- a/Libraries/LibWeb/Loader/Resource.cpp +++ b/Libraries/LibWeb/Loader/Resource.cpp @@ -25,7 +25,7 @@ */ #include -#include +#include #include namespace Web { diff --git a/Libraries/LibWeb/PageView.cpp b/Libraries/LibWeb/PageView.cpp index c4ea1561904..fbf49d87709 100644 --- a/Libraries/LibWeb/PageView.cpp +++ b/Libraries/LibWeb/PageView.cpp @@ -38,8 +38,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/Libraries/LibWeb/Parser/HTMLDocumentParser.cpp b/Libraries/LibWeb/Parser/HTMLDocumentParser.cpp index 1ab8f14d1e7..c360b1f8e1b 100644 --- a/Libraries/LibWeb/Parser/HTMLDocumentParser.cpp +++ b/Libraries/LibWeb/Parser/HTMLDocumentParser.cpp @@ -32,9 +32,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/Libraries/LibWeb/SVG/SVGPathElement.h b/Libraries/LibWeb/SVG/SVGPathElement.h index ad17d1780d6..8aeed965592 100644 --- a/Libraries/LibWeb/SVG/SVGPathElement.h +++ b/Libraries/LibWeb/SVG/SVGPathElement.h @@ -27,7 +27,7 @@ #pragma once #include -#include +#include #include namespace Web::SVG {