diff --git a/Applications/Browser/InspectorWidget.cpp b/Applications/Browser/InspectorWidget.cpp index 024d192f4ff..63e8abdab3b 100644 --- a/Applications/Browser/InspectorWidget.cpp +++ b/Applications/Browser/InspectorWidget.cpp @@ -30,10 +30,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include InspectorWidget::InspectorWidget() { diff --git a/Applications/Browser/InspectorWidget.h b/Applications/Browser/InspectorWidget.h index de03e007a65..f070b77cf74 100644 --- a/Applications/Browser/InspectorWidget.h +++ b/Applications/Browser/InspectorWidget.h @@ -25,7 +25,7 @@ */ #include -#include +#include class InspectorWidget final : public GUI::Widget { C_OBJECT(InspectorWidget) diff --git a/Applications/Browser/Makefile b/Applications/Browser/Makefile index 12f28553cbd..4a57f47e68e 100755 --- a/Applications/Browser/Makefile +++ b/Applications/Browser/Makefile @@ -4,11 +4,11 @@ OBJS = \ PROGRAM = Browser -LIB_DEPS = GUI HTML Gfx IPC Protocol Core +LIB_DEPS = GUI Web Gfx IPC Protocol Core -main.cpp: ../../Libraries/LibHTML/CSS/PropertyID.h -../../Libraries/LibHTML/CSS/PropertyID.h: - @flock ../../Libraries/LibHTML $(MAKE) -C ../../Libraries/LibHTML +main.cpp: ../../Libraries/LibWeb/CSS/PropertyID.h +../../Libraries/LibWeb/CSS/PropertyID.h: + @flock ../../Libraries/LibWeb $(MAKE) -C ../../Libraries/LibWeb main.cpp: ../../Servers/ProtocolServer/ProtocolClientEndpoint.h ../../Servers/ProtocolServer/ProtocolClientEndpoint.h: diff --git a/Applications/Browser/main.cpp b/Applications/Browser/main.cpp index 92c3ceac7ea..65a1176bd8e 100644 --- a/Applications/Browser/main.cpp +++ b/Applications/Browser/main.cpp @@ -37,18 +37,18 @@ #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/Applications/Help/Makefile b/Applications/Help/Makefile index c6e49232965..8fac56daac0 100644 --- a/Applications/Help/Makefile +++ b/Applications/Help/Makefile @@ -7,6 +7,6 @@ OBJS = \ PROGRAM = Help -LIB_DEPS = GUI HTML Gfx Markdown IPC Protocol Thread Pthread Core +LIB_DEPS = GUI Web Gfx Markdown IPC Protocol Thread Pthread Core include ../../Makefile.common diff --git a/Applications/Help/main.cpp b/Applications/Help/main.cpp index cb640633ff4..d9b9f304175 100644 --- a/Applications/Help/main.cpp +++ b/Applications/Help/main.cpp @@ -40,10 +40,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/Applications/IRCClient/IRCLogBuffer.cpp b/Applications/IRCClient/IRCLogBuffer.cpp index aefc0db8360..0dd2d8fc158 100644 --- a/Applications/IRCClient/IRCLogBuffer.cpp +++ b/Applications/IRCClient/IRCLogBuffer.cpp @@ -26,13 +26,13 @@ #include "IRCLogBuffer.h" #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/Applications/IRCClient/IRCLogBuffer.h b/Applications/IRCClient/IRCLogBuffer.h index 4cef97a77dc..183ee21b018 100644 --- a/Applications/IRCClient/IRCLogBuffer.h +++ b/Applications/IRCClient/IRCLogBuffer.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include class IRCLogBuffer : public RefCounted { public: diff --git a/Applications/IRCClient/IRCWindow.cpp b/Applications/IRCClient/IRCWindow.cpp index 1994f1e0594..e68bc395772 100644 --- a/Applications/IRCClient/IRCWindow.cpp +++ b/Applications/IRCClient/IRCWindow.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include IRCWindow::IRCWindow(IRCClient& client, void* owner, Type type, const String& name) : m_client(client) diff --git a/Applications/IRCClient/IRCWindow.h b/Applications/IRCClient/IRCWindow.h index c8189fee631..f652d35145e 100644 --- a/Applications/IRCClient/IRCWindow.h +++ b/Applications/IRCClient/IRCWindow.h @@ -27,7 +27,7 @@ #pragma once #include -#include +#include class IRCChannel; class IRCClient; diff --git a/Applications/IRCClient/Makefile b/Applications/IRCClient/Makefile index afe6db9b86b..1bc0b646fe8 100644 --- a/Applications/IRCClient/Makefile +++ b/Applications/IRCClient/Makefile @@ -11,6 +11,6 @@ OBJS = \ PROGRAM = IRCClient -LIB_DEPS = GUI HTML Gfx Protocol IPC Thread Pthread Core +LIB_DEPS = GUI Web Gfx Protocol IPC Thread Pthread Core include ../../Makefile.common diff --git a/Base/home/anon/www/welcome.html b/Base/home/anon/www/welcome.html index 16563d09fcd..728e3ba17bf 100644 --- a/Base/home/anon/www/welcome.html +++ b/Base/home/anon/www/welcome.html @@ -20,7 +20,7 @@ h1 {

Welcome to the Serenity Browser!

-

This is a very simple browser built on the LibHTML engine.

+

This is a very simple browser built on the LibWeb engine.

Some small test pages:

  • small
    • diff --git a/DevTools/HackStudio/Editor.cpp b/DevTools/HackStudio/Editor.cpp index b2a725c5ec5..9cecd1b330b 100644 --- a/DevTools/HackStudio/Editor.cpp +++ b/DevTools/HackStudio/Editor.cpp @@ -34,11 +34,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include //#define EDITOR_DEBUG @@ -151,7 +151,7 @@ void Editor::show_documentation_tooltip_if_available(const String& hovered_token return; } - // FIXME: LibHTML needs a friendlier DOM manipulation API. Something like innerHTML :^) + // FIXME: LibWeb needs a friendlier DOM manipulation API. Something like innerHTML :^) auto style_element = create_element(*html_document, "style"); style_element->append_child(adopt(*new Web::Text(*html_document, "body { background-color: #dac7b5; }"))); diff --git a/DevTools/HackStudio/Editor.h b/DevTools/HackStudio/Editor.h index 3df2f8816fa..f4096cd126b 100644 --- a/DevTools/HackStudio/Editor.h +++ b/DevTools/HackStudio/Editor.h @@ -27,7 +27,7 @@ #pragma once #include -#include +#include class EditorWrapper; diff --git a/DevTools/HackStudio/Makefile b/DevTools/HackStudio/Makefile index 6598b57e350..d1f17a06518 100644 --- a/DevTools/HackStudio/Makefile +++ b/DevTools/HackStudio/Makefile @@ -17,6 +17,6 @@ OBJS = \ PROGRAM = HackStudio -LIB_DEPS = GUI HTML VT Protocol Markdown Gfx IPC Thread Pthread Core +LIB_DEPS = GUI Web VT Protocol Markdown Gfx IPC Thread Pthread Core include ../../Makefile.common diff --git a/Libraries/LibHTML/CSS/.gitignore b/Libraries/LibWeb/CSS/.gitignore similarity index 100% rename from Libraries/LibHTML/CSS/.gitignore rename to Libraries/LibWeb/CSS/.gitignore diff --git a/Libraries/LibHTML/CSS/Default.css b/Libraries/LibWeb/CSS/Default.css similarity index 100% rename from Libraries/LibHTML/CSS/Default.css rename to Libraries/LibWeb/CSS/Default.css diff --git a/Libraries/LibHTML/CSS/Length.h b/Libraries/LibWeb/CSS/Length.h similarity index 100% rename from Libraries/LibHTML/CSS/Length.h rename to Libraries/LibWeb/CSS/Length.h diff --git a/Libraries/LibHTML/CSS/LengthBox.h b/Libraries/LibWeb/CSS/LengthBox.h similarity index 97% rename from Libraries/LibHTML/CSS/LengthBox.h rename to Libraries/LibWeb/CSS/LengthBox.h index 1ab356ff50c..230babd4834 100644 --- a/Libraries/LibHTML/CSS/LengthBox.h +++ b/Libraries/LibWeb/CSS/LengthBox.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibHTML/CSS/Properties.json b/Libraries/LibWeb/CSS/Properties.json similarity index 100% rename from Libraries/LibHTML/CSS/Properties.json rename to Libraries/LibWeb/CSS/Properties.json diff --git a/Libraries/LibHTML/CSS/Selector.cpp b/Libraries/LibWeb/CSS/Selector.cpp similarity index 98% rename from Libraries/LibHTML/CSS/Selector.cpp rename to Libraries/LibWeb/CSS/Selector.cpp index 064fe15984e..8bc2aafb5ea 100644 --- a/Libraries/LibHTML/CSS/Selector.cpp +++ b/Libraries/LibWeb/CSS/Selector.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/LibHTML/CSS/Selector.h b/Libraries/LibWeb/CSS/Selector.h similarity index 98% rename from Libraries/LibHTML/CSS/Selector.h rename to Libraries/LibWeb/CSS/Selector.h index 979080a1875..4abac988ff0 100644 --- a/Libraries/LibHTML/CSS/Selector.h +++ b/Libraries/LibWeb/CSS/Selector.h @@ -28,7 +28,7 @@ #include #include -#include +#include namespace Web { diff --git a/Libraries/LibHTML/CSS/SelectorEngine.cpp b/Libraries/LibWeb/CSS/SelectorEngine.cpp similarity index 97% rename from Libraries/LibHTML/CSS/SelectorEngine.cpp rename to Libraries/LibWeb/CSS/SelectorEngine.cpp index e9f46a3feeb..3d21f418c24 100644 --- a/Libraries/LibHTML/CSS/SelectorEngine.cpp +++ b/Libraries/LibWeb/CSS/SelectorEngine.cpp @@ -24,10 +24,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include +#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/CSS/SelectorEngine.h b/Libraries/LibWeb/CSS/SelectorEngine.h similarity index 97% rename from Libraries/LibHTML/CSS/SelectorEngine.h rename to Libraries/LibWeb/CSS/SelectorEngine.h index 8017697ad14..e5be692ce75 100644 --- a/Libraries/LibHTML/CSS/SelectorEngine.h +++ b/Libraries/LibWeb/CSS/SelectorEngine.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibHTML/CSS/Specificity.h b/Libraries/LibWeb/CSS/Specificity.h similarity index 100% rename from Libraries/LibHTML/CSS/Specificity.h rename to Libraries/LibWeb/CSS/Specificity.h diff --git a/Libraries/LibHTML/CSS/StyleDeclaration.cpp b/Libraries/LibWeb/CSS/StyleDeclaration.cpp similarity index 97% rename from Libraries/LibHTML/CSS/StyleDeclaration.cpp rename to Libraries/LibWeb/CSS/StyleDeclaration.cpp index 0ffd87beeec..4a56a33a654 100644 --- a/Libraries/LibHTML/CSS/StyleDeclaration.cpp +++ b/Libraries/LibWeb/CSS/StyleDeclaration.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/LibHTML/CSS/StyleDeclaration.h b/Libraries/LibWeb/CSS/StyleDeclaration.h similarity index 98% rename from Libraries/LibHTML/CSS/StyleDeclaration.h rename to Libraries/LibWeb/CSS/StyleDeclaration.h index 9ef3db33723..966bb4c0a59 100644 --- a/Libraries/LibHTML/CSS/StyleDeclaration.h +++ b/Libraries/LibWeb/CSS/StyleDeclaration.h @@ -28,7 +28,7 @@ #include #include -#include +#include namespace Web { diff --git a/Libraries/LibHTML/CSS/StyleProperties.cpp b/Libraries/LibWeb/CSS/StyleProperties.cpp similarity index 98% rename from Libraries/LibHTML/CSS/StyleProperties.cpp rename to Libraries/LibWeb/CSS/StyleProperties.cpp index 645f180d222..42469062d09 100644 --- a/Libraries/LibHTML/CSS/StyleProperties.cpp +++ b/Libraries/LibWeb/CSS/StyleProperties.cpp @@ -25,8 +25,8 @@ */ #include -#include -#include +#include +#include #include namespace Web { diff --git a/Libraries/LibHTML/CSS/StyleProperties.h b/Libraries/LibWeb/CSS/StyleProperties.h similarity index 98% rename from Libraries/LibHTML/CSS/StyleProperties.h rename to Libraries/LibWeb/CSS/StyleProperties.h index 9540eba3da6..8835ff0380b 100644 --- a/Libraries/LibHTML/CSS/StyleProperties.h +++ b/Libraries/LibWeb/CSS/StyleProperties.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include namespace Web { diff --git a/Libraries/LibHTML/CSS/StyleResolver.cpp b/Libraries/LibWeb/CSS/StyleResolver.cpp similarity index 97% rename from Libraries/LibHTML/CSS/StyleResolver.cpp rename to Libraries/LibWeb/CSS/StyleResolver.cpp index 347cd6cefc8..7b5a890fa01 100644 --- a/Libraries/LibHTML/CSS/StyleResolver.cpp +++ b/Libraries/LibWeb/CSS/StyleResolver.cpp @@ -24,13 +24,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/Libraries/LibHTML/CSS/StyleResolver.h b/Libraries/LibWeb/CSS/StyleResolver.h similarity index 98% rename from Libraries/LibHTML/CSS/StyleResolver.h rename to Libraries/LibWeb/CSS/StyleResolver.h index 325fef496d7..95e691ed7fa 100644 --- a/Libraries/LibHTML/CSS/StyleResolver.h +++ b/Libraries/LibWeb/CSS/StyleResolver.h @@ -28,7 +28,7 @@ #include #include -#include +#include namespace Web { diff --git a/Libraries/LibHTML/CSS/StyleRule.cpp b/Libraries/LibWeb/CSS/StyleRule.cpp similarity index 97% rename from Libraries/LibHTML/CSS/StyleRule.cpp rename to Libraries/LibWeb/CSS/StyleRule.cpp index 5fddcb5d2c2..bed671fd477 100644 --- a/Libraries/LibHTML/CSS/StyleRule.cpp +++ b/Libraries/LibWeb/CSS/StyleRule.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/LibHTML/CSS/StyleRule.h b/Libraries/LibWeb/CSS/StyleRule.h similarity index 96% rename from Libraries/LibHTML/CSS/StyleRule.h rename to Libraries/LibWeb/CSS/StyleRule.h index 4bce75e293b..2b857080570 100644 --- a/Libraries/LibHTML/CSS/StyleRule.h +++ b/Libraries/LibWeb/CSS/StyleRule.h @@ -27,8 +27,8 @@ #pragma once #include -#include -#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/CSS/StyleSheet.cpp b/Libraries/LibWeb/CSS/StyleSheet.cpp similarity index 97% rename from Libraries/LibHTML/CSS/StyleSheet.cpp rename to Libraries/LibWeb/CSS/StyleSheet.cpp index 092abf7e108..e153a3b7ef3 100644 --- a/Libraries/LibHTML/CSS/StyleSheet.cpp +++ b/Libraries/LibWeb/CSS/StyleSheet.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/LibHTML/CSS/StyleSheet.h b/Libraries/LibWeb/CSS/StyleSheet.h similarity index 98% rename from Libraries/LibHTML/CSS/StyleSheet.h rename to Libraries/LibWeb/CSS/StyleSheet.h index 0646c25e24f..4acd4460388 100644 --- a/Libraries/LibHTML/CSS/StyleSheet.h +++ b/Libraries/LibWeb/CSS/StyleSheet.h @@ -27,7 +27,7 @@ #pragma once #include -#include +#include namespace Web { diff --git a/Libraries/LibHTML/CSS/StyleValue.cpp b/Libraries/LibWeb/CSS/StyleValue.cpp similarity index 95% rename from Libraries/LibHTML/CSS/StyleValue.cpp rename to Libraries/LibWeb/CSS/StyleValue.cpp index 6cc4f087d0e..36b5e23644b 100644 --- a/Libraries/LibHTML/CSS/StyleValue.cpp +++ b/Libraries/LibWeb/CSS/StyleValue.cpp @@ -27,10 +27,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/CSS/StyleValue.h b/Libraries/LibWeb/CSS/StyleValue.h similarity index 98% rename from Libraries/LibHTML/CSS/StyleValue.h rename to Libraries/LibWeb/CSS/StyleValue.h index 6dd1a3463d7..c1214a0bca5 100644 --- a/Libraries/LibHTML/CSS/StyleValue.h +++ b/Libraries/LibWeb/CSS/StyleValue.h @@ -34,8 +34,8 @@ #include #include #include -#include -#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/CodeGenerators/Generate_CSS_PropertyID_cpp/Generate_CSS_PropertyID_cpp.cpp b/Libraries/LibWeb/CodeGenerators/Generate_CSS_PropertyID_cpp/Generate_CSS_PropertyID_cpp.cpp similarity index 98% rename from Libraries/LibHTML/CodeGenerators/Generate_CSS_PropertyID_cpp/Generate_CSS_PropertyID_cpp.cpp rename to Libraries/LibWeb/CodeGenerators/Generate_CSS_PropertyID_cpp/Generate_CSS_PropertyID_cpp.cpp index c3491bbd329..f31fe62310b 100644 --- a/Libraries/LibHTML/CodeGenerators/Generate_CSS_PropertyID_cpp/Generate_CSS_PropertyID_cpp.cpp +++ b/Libraries/LibWeb/CodeGenerators/Generate_CSS_PropertyID_cpp/Generate_CSS_PropertyID_cpp.cpp @@ -59,7 +59,7 @@ int main(int argc, char** argv) ASSERT(json.is_object()); dbg() << "#include "; - dbg() << "#include "; + dbg() << "#include "; dbg() << "namespace Web {"; dbg() << "namespace CSS {"; diff --git a/Libraries/LibHTML/CodeGenerators/Generate_CSS_PropertyID_cpp/Makefile b/Libraries/LibWeb/CodeGenerators/Generate_CSS_PropertyID_cpp/Makefile similarity index 100% rename from Libraries/LibHTML/CodeGenerators/Generate_CSS_PropertyID_cpp/Makefile rename to Libraries/LibWeb/CodeGenerators/Generate_CSS_PropertyID_cpp/Makefile diff --git a/Libraries/LibHTML/CodeGenerators/Generate_CSS_PropertyID_h/Generate_CSS_PropertyID_h.cpp b/Libraries/LibWeb/CodeGenerators/Generate_CSS_PropertyID_h/Generate_CSS_PropertyID_h.cpp similarity index 100% rename from Libraries/LibHTML/CodeGenerators/Generate_CSS_PropertyID_h/Generate_CSS_PropertyID_h.cpp rename to Libraries/LibWeb/CodeGenerators/Generate_CSS_PropertyID_h/Generate_CSS_PropertyID_h.cpp diff --git a/Libraries/LibHTML/CodeGenerators/Generate_CSS_PropertyID_h/Makefile b/Libraries/LibWeb/CodeGenerators/Generate_CSS_PropertyID_h/Makefile similarity index 100% rename from Libraries/LibHTML/CodeGenerators/Generate_CSS_PropertyID_h/Makefile rename to Libraries/LibWeb/CodeGenerators/Generate_CSS_PropertyID_h/Makefile diff --git a/Libraries/LibHTML/CodeGenerators/Makefile b/Libraries/LibWeb/CodeGenerators/Makefile similarity index 100% rename from Libraries/LibHTML/CodeGenerators/Makefile rename to Libraries/LibWeb/CodeGenerators/Makefile diff --git a/Libraries/LibHTML/DOM/CharacterData.cpp b/Libraries/LibWeb/DOM/CharacterData.cpp similarity index 97% rename from Libraries/LibHTML/DOM/CharacterData.cpp rename to Libraries/LibWeb/DOM/CharacterData.cpp index 83b14fb54a3..a7fa15eb1da 100644 --- a/Libraries/LibHTML/DOM/CharacterData.cpp +++ b/Libraries/LibWeb/DOM/CharacterData.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/LibHTML/DOM/CharacterData.h b/Libraries/LibWeb/DOM/CharacterData.h similarity index 98% rename from Libraries/LibHTML/DOM/CharacterData.h rename to Libraries/LibWeb/DOM/CharacterData.h index 81533bfaad1..dece5fe3388 100644 --- a/Libraries/LibHTML/DOM/CharacterData.h +++ b/Libraries/LibWeb/DOM/CharacterData.h @@ -27,7 +27,7 @@ #pragma once #include -#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/Comment.cpp b/Libraries/LibWeb/DOM/Comment.cpp similarity index 95% rename from Libraries/LibHTML/DOM/Comment.cpp rename to Libraries/LibWeb/DOM/Comment.cpp index 18c581a4274..0bd30e008ef 100644 --- a/Libraries/LibHTML/DOM/Comment.cpp +++ b/Libraries/LibWeb/DOM/Comment.cpp @@ -24,8 +24,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/Comment.h b/Libraries/LibWeb/DOM/Comment.h similarity index 97% rename from Libraries/LibHTML/DOM/Comment.h rename to Libraries/LibWeb/DOM/Comment.h index 75bfd215c09..8530ad9191a 100644 --- a/Libraries/LibHTML/DOM/Comment.h +++ b/Libraries/LibWeb/DOM/Comment.h @@ -27,7 +27,7 @@ #pragma once #include -#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/Document.cpp b/Libraries/LibWeb/DOM/Document.cpp similarity index 94% rename from Libraries/LibHTML/DOM/Document.cpp rename to Libraries/LibWeb/DOM/Document.cpp index ae24ec4ddec..6b2f11e81a1 100644 --- a/Libraries/LibHTML/DOM/Document.cpp +++ b/Libraries/LibWeb/DOM/Document.cpp @@ -28,19 +28,19 @@ #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 namespace Web { diff --git a/Libraries/LibHTML/DOM/Document.h b/Libraries/LibWeb/DOM/Document.h similarity index 97% rename from Libraries/LibHTML/DOM/Document.h rename to Libraries/LibWeb/DOM/Document.h index 6f7ab80cc01..aa7d3e2014e 100644 --- a/Libraries/LibHTML/DOM/Document.h +++ b/Libraries/LibWeb/DOM/Document.h @@ -33,9 +33,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/DocumentFragment.h b/Libraries/LibWeb/DOM/DocumentFragment.h similarity index 98% rename from Libraries/LibHTML/DOM/DocumentFragment.h rename to Libraries/LibWeb/DOM/DocumentFragment.h index 6034819d554..55e51feec4c 100644 --- a/Libraries/LibHTML/DOM/DocumentFragment.h +++ b/Libraries/LibWeb/DOM/DocumentFragment.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/DocumentType.cpp b/Libraries/LibWeb/DOM/DocumentType.cpp similarity index 97% rename from Libraries/LibHTML/DOM/DocumentType.cpp rename to Libraries/LibWeb/DOM/DocumentType.cpp index 43e95e153aa..c6481f78247 100644 --- a/Libraries/LibHTML/DOM/DocumentType.cpp +++ b/Libraries/LibWeb/DOM/DocumentType.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/LibHTML/DOM/DocumentType.h b/Libraries/LibWeb/DOM/DocumentType.h similarity index 98% rename from Libraries/LibHTML/DOM/DocumentType.h rename to Libraries/LibWeb/DOM/DocumentType.h index 60b98717680..b863ecb98cc 100644 --- a/Libraries/LibHTML/DOM/DocumentType.h +++ b/Libraries/LibWeb/DOM/DocumentType.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/Element.cpp b/Libraries/LibWeb/DOM/Element.cpp similarity index 93% rename from Libraries/LibHTML/DOM/Element.cpp rename to Libraries/LibWeb/DOM/Element.cpp index ea35b90d600..fc3674a32b4 100644 --- a/Libraries/LibHTML/DOM/Element.cpp +++ b/Libraries/LibWeb/DOM/Element.cpp @@ -24,18 +24,18 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/Element.h b/Libraries/LibWeb/DOM/Element.h similarity index 97% rename from Libraries/LibHTML/DOM/Element.h rename to Libraries/LibWeb/DOM/Element.h index 6039807e065..0e7af34ba8f 100644 --- a/Libraries/LibHTML/DOM/Element.h +++ b/Libraries/LibWeb/DOM/Element.h @@ -27,8 +27,8 @@ #pragma once #include -#include -#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/ElementFactory.cpp b/Libraries/LibWeb/DOM/ElementFactory.cpp similarity index 84% rename from Libraries/LibHTML/DOM/ElementFactory.cpp rename to Libraries/LibWeb/DOM/ElementFactory.cpp index 5055fcc6585..b2c362fa884 100644 --- a/Libraries/LibHTML/DOM/ElementFactory.cpp +++ b/Libraries/LibWeb/DOM/ElementFactory.cpp @@ -24,22 +24,22 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#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 namespace Web { diff --git a/Libraries/LibHTML/DOM/ElementFactory.h b/Libraries/LibWeb/DOM/ElementFactory.h similarity index 97% rename from Libraries/LibHTML/DOM/ElementFactory.h rename to Libraries/LibWeb/DOM/ElementFactory.h index 0a87c672d11..3c494e78cd6 100644 --- a/Libraries/LibHTML/DOM/ElementFactory.h +++ b/Libraries/LibWeb/DOM/ElementFactory.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/HTMLAnchorElement.cpp b/Libraries/LibWeb/DOM/HTMLAnchorElement.cpp similarity index 97% rename from Libraries/LibHTML/DOM/HTMLAnchorElement.cpp rename to Libraries/LibWeb/DOM/HTMLAnchorElement.cpp index b763512d8b9..5fffa52fdf0 100644 --- a/Libraries/LibHTML/DOM/HTMLAnchorElement.cpp +++ b/Libraries/LibWeb/DOM/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/LibHTML/DOM/HTMLAnchorElement.h b/Libraries/LibWeb/DOM/HTMLAnchorElement.h similarity index 97% rename from Libraries/LibHTML/DOM/HTMLAnchorElement.h rename to Libraries/LibWeb/DOM/HTMLAnchorElement.h index 8f91354f916..89d20c7be41 100644 --- a/Libraries/LibHTML/DOM/HTMLAnchorElement.h +++ b/Libraries/LibWeb/DOM/HTMLAnchorElement.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/HTMLBRElement.cpp b/Libraries/LibWeb/DOM/HTMLBRElement.cpp similarity index 95% rename from Libraries/LibHTML/DOM/HTMLBRElement.cpp rename to Libraries/LibWeb/DOM/HTMLBRElement.cpp index 7eb7eb1e90c..f7667c44d6f 100644 --- a/Libraries/LibHTML/DOM/HTMLBRElement.cpp +++ b/Libraries/LibWeb/DOM/HTMLBRElement.cpp @@ -24,8 +24,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/HTMLBRElement.h b/Libraries/LibWeb/DOM/HTMLBRElement.h similarity index 98% rename from Libraries/LibHTML/DOM/HTMLBRElement.h rename to Libraries/LibWeb/DOM/HTMLBRElement.h index 21181b9c892..4dcf6ff1855 100644 --- a/Libraries/LibHTML/DOM/HTMLBRElement.h +++ b/Libraries/LibWeb/DOM/HTMLBRElement.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/HTMLBlinkElement.cpp b/Libraries/LibWeb/DOM/HTMLBlinkElement.cpp similarity index 92% rename from Libraries/LibHTML/DOM/HTMLBlinkElement.cpp rename to Libraries/LibWeb/DOM/HTMLBlinkElement.cpp index 940989c4594..51f8d966423 100644 --- a/Libraries/LibHTML/DOM/HTMLBlinkElement.cpp +++ b/Libraries/LibWeb/DOM/HTMLBlinkElement.cpp @@ -25,10 +25,10 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/HTMLBlinkElement.h b/Libraries/LibWeb/DOM/HTMLBlinkElement.h similarity index 97% rename from Libraries/LibHTML/DOM/HTMLBlinkElement.h rename to Libraries/LibWeb/DOM/HTMLBlinkElement.h index cb093ce5d55..63d85b50932 100644 --- a/Libraries/LibHTML/DOM/HTMLBlinkElement.h +++ b/Libraries/LibWeb/DOM/HTMLBlinkElement.h @@ -27,7 +27,7 @@ #pragma once #include -#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/HTMLBodyElement.cpp b/Libraries/LibWeb/DOM/HTMLBodyElement.cpp similarity index 95% rename from Libraries/LibHTML/DOM/HTMLBodyElement.cpp rename to Libraries/LibWeb/DOM/HTMLBodyElement.cpp index 62abfd188d5..a5fbd9dc902 100644 --- a/Libraries/LibHTML/DOM/HTMLBodyElement.cpp +++ b/Libraries/LibWeb/DOM/HTMLBodyElement.cpp @@ -24,10 +24,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include +#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/HTMLBodyElement.h b/Libraries/LibWeb/DOM/HTMLBodyElement.h similarity index 98% rename from Libraries/LibHTML/DOM/HTMLBodyElement.h rename to Libraries/LibWeb/DOM/HTMLBodyElement.h index 1f757cb3243..22296fa46ce 100644 --- a/Libraries/LibHTML/DOM/HTMLBodyElement.h +++ b/Libraries/LibWeb/DOM/HTMLBodyElement.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/HTMLElement.cpp b/Libraries/LibWeb/DOM/HTMLElement.cpp similarity index 97% rename from Libraries/LibHTML/DOM/HTMLElement.cpp rename to Libraries/LibWeb/DOM/HTMLElement.cpp index 0f1214278ca..030a442854b 100644 --- a/Libraries/LibHTML/DOM/HTMLElement.cpp +++ b/Libraries/LibWeb/DOM/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/LibHTML/DOM/HTMLElement.h b/Libraries/LibWeb/DOM/HTMLElement.h similarity index 98% rename from Libraries/LibHTML/DOM/HTMLElement.h rename to Libraries/LibWeb/DOM/HTMLElement.h index 912ac898d90..56d8329b420 100644 --- a/Libraries/LibHTML/DOM/HTMLElement.h +++ b/Libraries/LibWeb/DOM/HTMLElement.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/HTMLFontElement.cpp b/Libraries/LibWeb/DOM/HTMLFontElement.cpp similarity index 94% rename from Libraries/LibHTML/DOM/HTMLFontElement.cpp rename to Libraries/LibWeb/DOM/HTMLFontElement.cpp index 9e5ac545587..276daece4c5 100644 --- a/Libraries/LibHTML/DOM/HTMLFontElement.cpp +++ b/Libraries/LibWeb/DOM/HTMLFontElement.cpp @@ -24,9 +24,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include +#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/HTMLFontElement.h b/Libraries/LibWeb/DOM/HTMLFontElement.h similarity index 97% rename from Libraries/LibHTML/DOM/HTMLFontElement.h rename to Libraries/LibWeb/DOM/HTMLFontElement.h index 96503115e7f..57d0088426b 100644 --- a/Libraries/LibHTML/DOM/HTMLFontElement.h +++ b/Libraries/LibWeb/DOM/HTMLFontElement.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/HTMLFormElement.cpp b/Libraries/LibWeb/DOM/HTMLFormElement.cpp similarity index 95% rename from Libraries/LibHTML/DOM/HTMLFormElement.cpp rename to Libraries/LibWeb/DOM/HTMLFormElement.cpp index a0f2df04e03..f7092a73d00 100644 --- a/Libraries/LibHTML/DOM/HTMLFormElement.cpp +++ b/Libraries/LibWeb/DOM/HTMLFormElement.cpp @@ -25,10 +25,10 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/HTMLFormElement.h b/Libraries/LibWeb/DOM/HTMLFormElement.h similarity index 98% rename from Libraries/LibHTML/DOM/HTMLFormElement.h rename to Libraries/LibWeb/DOM/HTMLFormElement.h index 51cbf13bbd2..bd99ce5c07f 100644 --- a/Libraries/LibHTML/DOM/HTMLFormElement.h +++ b/Libraries/LibWeb/DOM/HTMLFormElement.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/HTMLHRElement.cpp b/Libraries/LibWeb/DOM/HTMLHRElement.cpp similarity index 97% rename from Libraries/LibHTML/DOM/HTMLHRElement.cpp rename to Libraries/LibWeb/DOM/HTMLHRElement.cpp index b4436e6966b..7d4dbb4a3b1 100644 --- a/Libraries/LibHTML/DOM/HTMLHRElement.cpp +++ b/Libraries/LibWeb/DOM/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/LibHTML/DOM/HTMLHRElement.h b/Libraries/LibWeb/DOM/HTMLHRElement.h similarity index 97% rename from Libraries/LibHTML/DOM/HTMLHRElement.h rename to Libraries/LibWeb/DOM/HTMLHRElement.h index 0b141d32a0c..48a57026f9f 100644 --- a/Libraries/LibHTML/DOM/HTMLHRElement.h +++ b/Libraries/LibWeb/DOM/HTMLHRElement.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/HTMLHeadElement.cpp b/Libraries/LibWeb/DOM/HTMLHeadElement.cpp similarity index 97% rename from Libraries/LibHTML/DOM/HTMLHeadElement.cpp rename to Libraries/LibWeb/DOM/HTMLHeadElement.cpp index 7191d3b3c9f..6d828b269e3 100644 --- a/Libraries/LibHTML/DOM/HTMLHeadElement.cpp +++ b/Libraries/LibWeb/DOM/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/LibHTML/DOM/HTMLHeadElement.h b/Libraries/LibWeb/DOM/HTMLHeadElement.h similarity index 97% rename from Libraries/LibHTML/DOM/HTMLHeadElement.h rename to Libraries/LibWeb/DOM/HTMLHeadElement.h index e769346987d..5acb84ea916 100644 --- a/Libraries/LibHTML/DOM/HTMLHeadElement.h +++ b/Libraries/LibWeb/DOM/HTMLHeadElement.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/HTMLHeadingElement.cpp b/Libraries/LibWeb/DOM/HTMLHeadingElement.cpp similarity index 97% rename from Libraries/LibHTML/DOM/HTMLHeadingElement.cpp rename to Libraries/LibWeb/DOM/HTMLHeadingElement.cpp index aad30884f31..fab61fda519 100644 --- a/Libraries/LibHTML/DOM/HTMLHeadingElement.cpp +++ b/Libraries/LibWeb/DOM/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/LibHTML/DOM/HTMLHeadingElement.h b/Libraries/LibWeb/DOM/HTMLHeadingElement.h similarity index 97% rename from Libraries/LibHTML/DOM/HTMLHeadingElement.h rename to Libraries/LibWeb/DOM/HTMLHeadingElement.h index 54089ebc2ee..0a8ad9ec4f2 100644 --- a/Libraries/LibHTML/DOM/HTMLHeadingElement.h +++ b/Libraries/LibWeb/DOM/HTMLHeadingElement.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/HTMLHtmlElement.cpp b/Libraries/LibWeb/DOM/HTMLHtmlElement.cpp similarity index 97% rename from Libraries/LibHTML/DOM/HTMLHtmlElement.cpp rename to Libraries/LibWeb/DOM/HTMLHtmlElement.cpp index 576a50c7650..af1355cbde8 100644 --- a/Libraries/LibHTML/DOM/HTMLHtmlElement.cpp +++ b/Libraries/LibWeb/DOM/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/LibHTML/DOM/HTMLHtmlElement.h b/Libraries/LibWeb/DOM/HTMLHtmlElement.h similarity index 97% rename from Libraries/LibHTML/DOM/HTMLHtmlElement.h rename to Libraries/LibWeb/DOM/HTMLHtmlElement.h index 673c80bc940..d926c3459d0 100644 --- a/Libraries/LibHTML/DOM/HTMLHtmlElement.h +++ b/Libraries/LibWeb/DOM/HTMLHtmlElement.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/HTMLImageElement.cpp b/Libraries/LibWeb/DOM/HTMLImageElement.cpp similarity index 95% rename from Libraries/LibHTML/DOM/HTMLImageElement.cpp rename to Libraries/LibWeb/DOM/HTMLImageElement.cpp index 316b6c0ce2e..f1db4428f9b 100644 --- a/Libraries/LibHTML/DOM/HTMLImageElement.cpp +++ b/Libraries/LibWeb/DOM/HTMLImageElement.cpp @@ -26,11 +26,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/HTMLImageElement.h b/Libraries/LibWeb/DOM/HTMLImageElement.h similarity index 98% rename from Libraries/LibHTML/DOM/HTMLImageElement.h rename to Libraries/LibWeb/DOM/HTMLImageElement.h index d4b412c12ff..f30f37d3a1e 100644 --- a/Libraries/LibHTML/DOM/HTMLImageElement.h +++ b/Libraries/LibWeb/DOM/HTMLImageElement.h @@ -28,7 +28,7 @@ #include #include -#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/HTMLInputElement.cpp b/Libraries/LibWeb/DOM/HTMLInputElement.cpp similarity index 93% rename from Libraries/LibHTML/DOM/HTMLInputElement.cpp rename to Libraries/LibWeb/DOM/HTMLInputElement.cpp index 0924c123c93..bd7194f251f 100644 --- a/Libraries/LibHTML/DOM/HTMLInputElement.cpp +++ b/Libraries/LibWeb/DOM/HTMLInputElement.cpp @@ -27,12 +27,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/HTMLInputElement.h b/Libraries/LibWeb/DOM/HTMLInputElement.h similarity index 98% rename from Libraries/LibHTML/DOM/HTMLInputElement.h rename to Libraries/LibWeb/DOM/HTMLInputElement.h index c4100d45269..f54d6efa6b4 100644 --- a/Libraries/LibHTML/DOM/HTMLInputElement.h +++ b/Libraries/LibWeb/DOM/HTMLInputElement.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/HTMLLinkElement.cpp b/Libraries/LibWeb/DOM/HTMLLinkElement.cpp similarity index 93% rename from Libraries/LibHTML/DOM/HTMLLinkElement.cpp rename to Libraries/LibWeb/DOM/HTMLLinkElement.cpp index 71083c88ddf..f2bd9e8aed4 100644 --- a/Libraries/LibHTML/DOM/HTMLLinkElement.cpp +++ b/Libraries/LibWeb/DOM/HTMLLinkElement.cpp @@ -27,10 +27,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/HTMLLinkElement.h b/Libraries/LibWeb/DOM/HTMLLinkElement.h similarity index 98% rename from Libraries/LibHTML/DOM/HTMLLinkElement.h rename to Libraries/LibWeb/DOM/HTMLLinkElement.h index 1e9176e1487..ad005b4e934 100644 --- a/Libraries/LibHTML/DOM/HTMLLinkElement.h +++ b/Libraries/LibWeb/DOM/HTMLLinkElement.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/HTMLStyleElement.cpp b/Libraries/LibWeb/DOM/HTMLStyleElement.cpp similarity index 93% rename from Libraries/LibHTML/DOM/HTMLStyleElement.cpp rename to Libraries/LibWeb/DOM/HTMLStyleElement.cpp index 865d0b264ad..4a48fb3fa11 100644 --- a/Libraries/LibHTML/DOM/HTMLStyleElement.cpp +++ b/Libraries/LibWeb/DOM/HTMLStyleElement.cpp @@ -25,10 +25,10 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/HTMLStyleElement.h b/Libraries/LibWeb/DOM/HTMLStyleElement.h similarity index 97% rename from Libraries/LibHTML/DOM/HTMLStyleElement.h rename to Libraries/LibWeb/DOM/HTMLStyleElement.h index deb54387c30..f4534c9dab3 100644 --- a/Libraries/LibHTML/DOM/HTMLStyleElement.h +++ b/Libraries/LibWeb/DOM/HTMLStyleElement.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/HTMLTitleElement.cpp b/Libraries/LibWeb/DOM/HTMLTitleElement.cpp similarity index 97% rename from Libraries/LibHTML/DOM/HTMLTitleElement.cpp rename to Libraries/LibWeb/DOM/HTMLTitleElement.cpp index 6aa5b699dbe..c523c8812e9 100644 --- a/Libraries/LibHTML/DOM/HTMLTitleElement.cpp +++ b/Libraries/LibWeb/DOM/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/LibHTML/DOM/HTMLTitleElement.h b/Libraries/LibWeb/DOM/HTMLTitleElement.h similarity index 97% rename from Libraries/LibHTML/DOM/HTMLTitleElement.h rename to Libraries/LibWeb/DOM/HTMLTitleElement.h index c5731d5f460..6485a3d428c 100644 --- a/Libraries/LibHTML/DOM/HTMLTitleElement.h +++ b/Libraries/LibWeb/DOM/HTMLTitleElement.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/Node.cpp b/Libraries/LibWeb/DOM/Node.cpp similarity index 90% rename from Libraries/LibHTML/DOM/Node.cpp rename to Libraries/LibWeb/DOM/Node.cpp index 7f46574414f..7c2341b0cb6 100644 --- a/Libraries/LibHTML/DOM/Node.cpp +++ b/Libraries/LibWeb/DOM/Node.cpp @@ -25,15 +25,15 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/Node.h b/Libraries/LibWeb/DOM/Node.h similarity index 99% rename from Libraries/LibHTML/DOM/Node.h rename to Libraries/LibWeb/DOM/Node.h index 5d839114795..51a48bdffdb 100644 --- a/Libraries/LibHTML/DOM/Node.h +++ b/Libraries/LibWeb/DOM/Node.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/ParentNode.cpp b/Libraries/LibWeb/DOM/ParentNode.cpp similarity index 97% rename from Libraries/LibHTML/DOM/ParentNode.cpp rename to Libraries/LibWeb/DOM/ParentNode.cpp index 9b4e8f3f7b1..3bc86e480da 100644 --- a/Libraries/LibHTML/DOM/ParentNode.cpp +++ b/Libraries/LibWeb/DOM/ParentNode.cpp @@ -24,5 +24,5 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include diff --git a/Libraries/LibHTML/DOM/ParentNode.h b/Libraries/LibWeb/DOM/ParentNode.h similarity index 98% rename from Libraries/LibHTML/DOM/ParentNode.h rename to Libraries/LibWeb/DOM/ParentNode.h index 48c6bd5e2a3..e8e826c9599 100644 --- a/Libraries/LibHTML/DOM/ParentNode.h +++ b/Libraries/LibWeb/DOM/ParentNode.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/Text.cpp b/Libraries/LibWeb/DOM/Text.cpp similarity index 96% rename from Libraries/LibHTML/DOM/Text.cpp rename to Libraries/LibWeb/DOM/Text.cpp index c107b22bb96..65c2e365503 100644 --- a/Libraries/LibHTML/DOM/Text.cpp +++ b/Libraries/LibWeb/DOM/Text.cpp @@ -24,8 +24,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOM/Text.h b/Libraries/LibWeb/DOM/Text.h similarity index 97% rename from Libraries/LibHTML/DOM/Text.h rename to Libraries/LibWeb/DOM/Text.h index e886b6d12f9..5a482ed6a08 100644 --- a/Libraries/LibHTML/DOM/Text.h +++ b/Libraries/LibWeb/DOM/Text.h @@ -27,7 +27,7 @@ #pragma once #include -#include +#include namespace Web { diff --git a/Libraries/LibHTML/DOMTreeModel.cpp b/Libraries/LibWeb/DOMTreeModel.cpp similarity index 98% rename from Libraries/LibHTML/DOMTreeModel.cpp rename to Libraries/LibWeb/DOMTreeModel.cpp index 8535e3bd6ff..8a4902b1e7d 100644 --- a/Libraries/LibHTML/DOMTreeModel.cpp +++ b/Libraries/LibWeb/DOMTreeModel.cpp @@ -26,9 +26,9 @@ #include "DOMTreeModel.h" #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/Libraries/LibHTML/DOMTreeModel.h b/Libraries/LibWeb/DOMTreeModel.h similarity index 100% rename from Libraries/LibHTML/DOMTreeModel.h rename to Libraries/LibWeb/DOMTreeModel.h diff --git a/Libraries/LibHTML/Dump.cpp b/Libraries/LibWeb/Dump.cpp similarity index 96% rename from Libraries/LibHTML/Dump.cpp rename to Libraries/LibWeb/Dump.cpp index b85105eb062..9da4607d198 100644 --- a/Libraries/LibHTML/Dump.cpp +++ b/Libraries/LibWeb/Dump.cpp @@ -25,17 +25,17 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include namespace Web { diff --git a/Libraries/LibHTML/Dump.h b/Libraries/LibWeb/Dump.h similarity index 100% rename from Libraries/LibHTML/Dump.h rename to Libraries/LibWeb/Dump.h diff --git a/Libraries/LibHTML/FontCache.cpp b/Libraries/LibWeb/FontCache.cpp similarity index 98% rename from Libraries/LibHTML/FontCache.cpp rename to Libraries/LibWeb/FontCache.cpp index 2942d0e1e59..c2ba8e70501 100644 --- a/Libraries/LibHTML/FontCache.cpp +++ b/Libraries/LibWeb/FontCache.cpp @@ -25,7 +25,7 @@ */ #include -#include +#include FontCache& FontCache::the() { diff --git a/Libraries/LibHTML/FontCache.h b/Libraries/LibWeb/FontCache.h similarity index 100% rename from Libraries/LibHTML/FontCache.h rename to Libraries/LibWeb/FontCache.h diff --git a/Libraries/LibHTML/Forward.h b/Libraries/LibWeb/Forward.h similarity index 100% rename from Libraries/LibHTML/Forward.h rename to Libraries/LibWeb/Forward.h diff --git a/Libraries/LibHTML/Frame.cpp b/Libraries/LibWeb/Frame.cpp similarity index 94% rename from Libraries/LibHTML/Frame.cpp rename to Libraries/LibWeb/Frame.cpp index 5559ce769b6..ca1645d1de0 100644 --- a/Libraries/LibHTML/Frame.cpp +++ b/Libraries/LibWeb/Frame.cpp @@ -24,10 +24,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include +#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/Frame.h b/Libraries/LibWeb/Frame.h similarity index 98% rename from Libraries/LibHTML/Frame.h rename to Libraries/LibWeb/Frame.h index 97a72b9d4f2..9f91a928a10 100644 --- a/Libraries/LibHTML/Frame.h +++ b/Libraries/LibWeb/Frame.h @@ -32,7 +32,7 @@ #include #include #include -#include +#include namespace Web { diff --git a/Libraries/LibHTML/HtmlView.cpp b/Libraries/LibWeb/HtmlView.cpp similarity index 96% rename from Libraries/LibHTML/HtmlView.cpp rename to Libraries/LibWeb/HtmlView.cpp index 85c23c47007..9b1ca65ee4f 100644 --- a/Libraries/LibHTML/HtmlView.cpp +++ b/Libraries/LibWeb/HtmlView.cpp @@ -32,19 +32,19 @@ #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 namespace Web { diff --git a/Libraries/LibHTML/HtmlView.h b/Libraries/LibWeb/HtmlView.h similarity index 98% rename from Libraries/LibHTML/HtmlView.h rename to Libraries/LibWeb/HtmlView.h index f5efd9aaefa..7eed509711c 100644 --- a/Libraries/LibHTML/HtmlView.h +++ b/Libraries/LibWeb/HtmlView.h @@ -27,7 +27,7 @@ #include #include -#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/BoxModelMetrics.cpp b/Libraries/LibWeb/Layout/BoxModelMetrics.cpp similarity index 97% rename from Libraries/LibHTML/Layout/BoxModelMetrics.cpp rename to Libraries/LibWeb/Layout/BoxModelMetrics.cpp index e10576e9e49..b218ce3c7cf 100644 --- a/Libraries/LibHTML/Layout/BoxModelMetrics.cpp +++ b/Libraries/LibWeb/Layout/BoxModelMetrics.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/LibHTML/Layout/BoxModelMetrics.h b/Libraries/LibWeb/Layout/BoxModelMetrics.h similarity index 98% rename from Libraries/LibHTML/Layout/BoxModelMetrics.h rename to Libraries/LibWeb/Layout/BoxModelMetrics.h index 0e27edc07cf..18bdb4c5740 100644 --- a/Libraries/LibHTML/Layout/BoxModelMetrics.h +++ b/Libraries/LibWeb/Layout/BoxModelMetrics.h @@ -27,7 +27,7 @@ #pragma once #include -#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LayoutBlock.cpp b/Libraries/LibWeb/Layout/LayoutBlock.cpp similarity index 98% rename from Libraries/LibHTML/Layout/LayoutBlock.cpp rename to Libraries/LibWeb/Layout/LayoutBlock.cpp index 360fa859244..38d1e818ad1 100644 --- a/Libraries/LibHTML/Layout/LayoutBlock.cpp +++ b/Libraries/LibWeb/Layout/LayoutBlock.cpp @@ -25,12 +25,12 @@ */ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include namespace Web { diff --git a/Libraries/LibHTML/Layout/LayoutBlock.h b/Libraries/LibWeb/Layout/LayoutBlock.h similarity index 98% rename from Libraries/LibHTML/Layout/LayoutBlock.h rename to Libraries/LibWeb/Layout/LayoutBlock.h index b1f0d57c059..0eaab2520cb 100644 --- a/Libraries/LibHTML/Layout/LayoutBlock.h +++ b/Libraries/LibWeb/Layout/LayoutBlock.h @@ -26,8 +26,8 @@ #pragma once -#include -#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LayoutBox.cpp b/Libraries/LibWeb/Layout/LayoutBox.cpp similarity index 98% rename from Libraries/LibHTML/Layout/LayoutBox.cpp rename to Libraries/LibWeb/Layout/LayoutBox.cpp index 0bc90c8f416..415592f6592 100644 --- a/Libraries/LibHTML/Layout/LayoutBox.cpp +++ b/Libraries/LibWeb/Layout/LayoutBox.cpp @@ -25,11 +25,11 @@ */ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include //#define DRAW_BOXES_AROUND_LAYOUT_NODES //#define DRAW_BOXES_AROUND_HOVERED_NODES diff --git a/Libraries/LibHTML/Layout/LayoutBox.h b/Libraries/LibWeb/Layout/LayoutBox.h similarity index 98% rename from Libraries/LibHTML/Layout/LayoutBox.h rename to Libraries/LibWeb/Layout/LayoutBox.h index d79b5a6e4e9..ced083e3dce 100644 --- a/Libraries/LibHTML/Layout/LayoutBox.h +++ b/Libraries/LibWeb/Layout/LayoutBox.h @@ -27,7 +27,7 @@ #pragma once #include -#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LayoutBreak.cpp b/Libraries/LibWeb/Layout/LayoutBreak.cpp similarity index 95% rename from Libraries/LibHTML/Layout/LayoutBreak.cpp rename to Libraries/LibWeb/Layout/LayoutBreak.cpp index d85e8c32e76..9d0d2b768ea 100644 --- a/Libraries/LibHTML/Layout/LayoutBreak.cpp +++ b/Libraries/LibWeb/Layout/LayoutBreak.cpp @@ -24,8 +24,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LayoutBreak.h b/Libraries/LibWeb/Layout/LayoutBreak.h similarity index 95% rename from Libraries/LibHTML/Layout/LayoutBreak.h rename to Libraries/LibWeb/Layout/LayoutBreak.h index ef3f0f24398..1fb28540d1d 100644 --- a/Libraries/LibHTML/Layout/LayoutBreak.h +++ b/Libraries/LibWeb/Layout/LayoutBreak.h @@ -26,8 +26,8 @@ #pragma once -#include -#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LayoutDocument.cpp b/Libraries/LibWeb/Layout/LayoutDocument.cpp similarity index 94% rename from Libraries/LibHTML/Layout/LayoutDocument.cpp rename to Libraries/LibWeb/Layout/LayoutDocument.cpp index f711a31071a..d01a9787ddb 100644 --- a/Libraries/LibHTML/Layout/LayoutDocument.cpp +++ b/Libraries/LibWeb/Layout/LayoutDocument.cpp @@ -24,10 +24,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include +#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LayoutDocument.h b/Libraries/LibWeb/Layout/LayoutDocument.h similarity index 96% rename from Libraries/LibHTML/Layout/LayoutDocument.h rename to Libraries/LibWeb/Layout/LayoutDocument.h index 39f68c459a2..89dd0f37264 100644 --- a/Libraries/LibHTML/Layout/LayoutDocument.h +++ b/Libraries/LibWeb/Layout/LayoutDocument.h @@ -26,8 +26,8 @@ #pragma once -#include -#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LayoutImage.cpp b/Libraries/LibWeb/Layout/LayoutImage.cpp similarity index 98% rename from Libraries/LibHTML/Layout/LayoutImage.cpp rename to Libraries/LibWeb/Layout/LayoutImage.cpp index 45e865a9317..20a9538effd 100644 --- a/Libraries/LibHTML/Layout/LayoutImage.cpp +++ b/Libraries/LibWeb/Layout/LayoutImage.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LayoutImage.h b/Libraries/LibWeb/Layout/LayoutImage.h similarity index 96% rename from Libraries/LibHTML/Layout/LayoutImage.h rename to Libraries/LibWeb/Layout/LayoutImage.h index 54246466d96..526d4832fce 100644 --- a/Libraries/LibHTML/Layout/LayoutImage.h +++ b/Libraries/LibWeb/Layout/LayoutImage.h @@ -26,8 +26,8 @@ #pragma once -#include -#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LayoutInline.cpp b/Libraries/LibWeb/Layout/LayoutInline.cpp similarity index 93% rename from Libraries/LibHTML/Layout/LayoutInline.cpp rename to Libraries/LibWeb/Layout/LayoutInline.cpp index 2ba96ff60e7..80faba75f1a 100644 --- a/Libraries/LibHTML/Layout/LayoutInline.cpp +++ b/Libraries/LibWeb/Layout/LayoutInline.cpp @@ -24,9 +24,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include +#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LayoutInline.h b/Libraries/LibWeb/Layout/LayoutInline.h similarity index 97% rename from Libraries/LibHTML/Layout/LayoutInline.h rename to Libraries/LibWeb/Layout/LayoutInline.h index cd962a41cb6..430e1bddd44 100644 --- a/Libraries/LibHTML/Layout/LayoutInline.h +++ b/Libraries/LibWeb/Layout/LayoutInline.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LayoutListItem.cpp b/Libraries/LibWeb/Layout/LayoutListItem.cpp similarity index 95% rename from Libraries/LibHTML/Layout/LayoutListItem.cpp rename to Libraries/LibWeb/Layout/LayoutListItem.cpp index 322bf7b6e36..0be7366b743 100644 --- a/Libraries/LibHTML/Layout/LayoutListItem.cpp +++ b/Libraries/LibWeb/Layout/LayoutListItem.cpp @@ -24,8 +24,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LayoutListItem.h b/Libraries/LibWeb/Layout/LayoutListItem.h similarity index 96% rename from Libraries/LibHTML/Layout/LayoutListItem.h rename to Libraries/LibWeb/Layout/LayoutListItem.h index 0b4414b496c..7c3987570c8 100644 --- a/Libraries/LibHTML/Layout/LayoutListItem.h +++ b/Libraries/LibWeb/Layout/LayoutListItem.h @@ -26,8 +26,8 @@ #pragma once -#include -#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LayoutListItemMarker.cpp b/Libraries/LibWeb/Layout/LayoutListItemMarker.cpp similarity index 97% rename from Libraries/LibHTML/Layout/LayoutListItemMarker.cpp rename to Libraries/LibWeb/Layout/LayoutListItemMarker.cpp index d30f43bf6fa..2188ce44aa4 100644 --- a/Libraries/LibHTML/Layout/LayoutListItemMarker.cpp +++ b/Libraries/LibWeb/Layout/LayoutListItemMarker.cpp @@ -25,7 +25,7 @@ */ #include -#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LayoutListItemMarker.h b/Libraries/LibWeb/Layout/LayoutListItemMarker.h similarity index 97% rename from Libraries/LibHTML/Layout/LayoutListItemMarker.h rename to Libraries/LibWeb/Layout/LayoutListItemMarker.h index c36baaf1f49..d2fefaa4c04 100644 --- a/Libraries/LibHTML/Layout/LayoutListItemMarker.h +++ b/Libraries/LibWeb/Layout/LayoutListItemMarker.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LayoutNode.cpp b/Libraries/LibWeb/Layout/LayoutNode.cpp similarity index 96% rename from Libraries/LibHTML/Layout/LayoutNode.cpp rename to Libraries/LibWeb/Layout/LayoutNode.cpp index fd0c7886426..5fd339c2917 100644 --- a/Libraries/LibHTML/Layout/LayoutNode.cpp +++ b/Libraries/LibWeb/Layout/LayoutNode.cpp @@ -25,11 +25,11 @@ */ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LayoutNode.h b/Libraries/LibWeb/Layout/LayoutNode.h similarity index 97% rename from Libraries/LibHTML/Layout/LayoutNode.h rename to Libraries/LibWeb/Layout/LayoutNode.h index ebb74e6deaa..9d4f0a05c7a 100644 --- a/Libraries/LibHTML/Layout/LayoutNode.h +++ b/Libraries/LibWeb/Layout/LayoutNode.h @@ -30,11 +30,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LayoutPosition.h b/Libraries/LibWeb/Layout/LayoutPosition.h similarity index 100% rename from Libraries/LibHTML/Layout/LayoutPosition.h rename to Libraries/LibWeb/Layout/LayoutPosition.h diff --git a/Libraries/LibHTML/Layout/LayoutReplaced.cpp b/Libraries/LibWeb/Layout/LayoutReplaced.cpp similarity index 94% rename from Libraries/LibHTML/Layout/LayoutReplaced.cpp rename to Libraries/LibWeb/Layout/LayoutReplaced.cpp index b60d2a28883..e98316ea737 100644 --- a/Libraries/LibHTML/Layout/LayoutReplaced.cpp +++ b/Libraries/LibWeb/Layout/LayoutReplaced.cpp @@ -24,9 +24,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include +#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LayoutReplaced.h b/Libraries/LibWeb/Layout/LayoutReplaced.h similarity index 96% rename from Libraries/LibHTML/Layout/LayoutReplaced.h rename to Libraries/LibWeb/Layout/LayoutReplaced.h index c48dfbaec18..d19c4e891a6 100644 --- a/Libraries/LibHTML/Layout/LayoutReplaced.h +++ b/Libraries/LibWeb/Layout/LayoutReplaced.h @@ -24,8 +24,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LayoutTable.cpp b/Libraries/LibWeb/Layout/LayoutTable.cpp similarity index 94% rename from Libraries/LibHTML/Layout/LayoutTable.cpp rename to Libraries/LibWeb/Layout/LayoutTable.cpp index 17f00bb21fa..782e27e76dd 100644 --- a/Libraries/LibHTML/Layout/LayoutTable.cpp +++ b/Libraries/LibWeb/Layout/LayoutTable.cpp @@ -24,9 +24,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include +#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LayoutTable.h b/Libraries/LibWeb/Layout/LayoutTable.h similarity index 98% rename from Libraries/LibHTML/Layout/LayoutTable.h rename to Libraries/LibWeb/Layout/LayoutTable.h index 738343449cf..5166fc2a940 100644 --- a/Libraries/LibHTML/Layout/LayoutTable.h +++ b/Libraries/LibWeb/Layout/LayoutTable.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LayoutTableCell.cpp b/Libraries/LibWeb/Layout/LayoutTableCell.cpp similarity index 95% rename from Libraries/LibHTML/Layout/LayoutTableCell.cpp rename to Libraries/LibWeb/Layout/LayoutTableCell.cpp index cf7f18078a8..7ff80f38b5c 100644 --- a/Libraries/LibHTML/Layout/LayoutTableCell.cpp +++ b/Libraries/LibWeb/Layout/LayoutTableCell.cpp @@ -24,8 +24,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LayoutTableCell.h b/Libraries/LibWeb/Layout/LayoutTableCell.h similarity index 98% rename from Libraries/LibHTML/Layout/LayoutTableCell.h rename to Libraries/LibWeb/Layout/LayoutTableCell.h index 329d68874d2..456ec8a08d9 100644 --- a/Libraries/LibHTML/Layout/LayoutTableCell.h +++ b/Libraries/LibWeb/Layout/LayoutTableCell.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LayoutTableRow.cpp b/Libraries/LibWeb/Layout/LayoutTableRow.cpp similarity index 94% rename from Libraries/LibHTML/Layout/LayoutTableRow.cpp rename to Libraries/LibWeb/Layout/LayoutTableRow.cpp index effd6eebb66..d8dc1f441c1 100644 --- a/Libraries/LibHTML/Layout/LayoutTableRow.cpp +++ b/Libraries/LibWeb/Layout/LayoutTableRow.cpp @@ -24,9 +24,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include +#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LayoutTableRow.h b/Libraries/LibWeb/Layout/LayoutTableRow.h similarity index 98% rename from Libraries/LibHTML/Layout/LayoutTableRow.h rename to Libraries/LibWeb/Layout/LayoutTableRow.h index fc6c7ad93c5..c77265fce84 100644 --- a/Libraries/LibHTML/Layout/LayoutTableRow.h +++ b/Libraries/LibWeb/Layout/LayoutTableRow.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LayoutText.cpp b/Libraries/LibWeb/Layout/LayoutText.cpp similarity index 98% rename from Libraries/LibHTML/Layout/LayoutText.cpp rename to Libraries/LibWeb/Layout/LayoutText.cpp index 6b2acd7373a..9103230cc59 100644 --- a/Libraries/LibHTML/Layout/LayoutText.cpp +++ b/Libraries/LibWeb/Layout/LayoutText.cpp @@ -29,9 +29,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include namespace Web { diff --git a/Libraries/LibHTML/Layout/LayoutText.h b/Libraries/LibWeb/Layout/LayoutText.h similarity index 97% rename from Libraries/LibHTML/Layout/LayoutText.h rename to Libraries/LibWeb/Layout/LayoutText.h index a8e4e47776b..324421ef40e 100644 --- a/Libraries/LibHTML/Layout/LayoutText.h +++ b/Libraries/LibWeb/Layout/LayoutText.h @@ -26,8 +26,8 @@ #pragma once -#include -#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LayoutTreeBuilder.cpp b/Libraries/LibWeb/Layout/LayoutTreeBuilder.cpp similarity index 93% rename from Libraries/LibHTML/Layout/LayoutTreeBuilder.cpp rename to Libraries/LibWeb/Layout/LayoutTreeBuilder.cpp index 436399f5102..5474f95ddd9 100644 --- a/Libraries/LibHTML/Layout/LayoutTreeBuilder.cpp +++ b/Libraries/LibWeb/Layout/LayoutTreeBuilder.cpp @@ -24,12 +24,12 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LayoutTreeBuilder.h b/Libraries/LibWeb/Layout/LayoutTreeBuilder.h similarity index 100% rename from Libraries/LibHTML/Layout/LayoutTreeBuilder.h rename to Libraries/LibWeb/Layout/LayoutTreeBuilder.h diff --git a/Libraries/LibHTML/Layout/LayoutWidget.cpp b/Libraries/LibWeb/Layout/LayoutWidget.cpp similarity index 98% rename from Libraries/LibHTML/Layout/LayoutWidget.cpp rename to Libraries/LibWeb/Layout/LayoutWidget.cpp index f748fdfda7e..b4f80290eac 100644 --- a/Libraries/LibHTML/Layout/LayoutWidget.cpp +++ b/Libraries/LibWeb/Layout/LayoutWidget.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LayoutWidget.h b/Libraries/LibWeb/Layout/LayoutWidget.h similarity index 97% rename from Libraries/LibHTML/Layout/LayoutWidget.h rename to Libraries/LibWeb/Layout/LayoutWidget.h index 7a8c9efe182..ab24c8dafcd 100644 --- a/Libraries/LibHTML/Layout/LayoutWidget.h +++ b/Libraries/LibWeb/Layout/LayoutWidget.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LineBox.cpp b/Libraries/LibWeb/Layout/LineBox.cpp similarity index 96% rename from Libraries/LibHTML/Layout/LineBox.cpp rename to Libraries/LibWeb/Layout/LineBox.cpp index c71ced5b2e5..be73e3c5c5c 100644 --- a/Libraries/LibHTML/Layout/LineBox.cpp +++ b/Libraries/LibWeb/Layout/LineBox.cpp @@ -25,9 +25,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include namespace Web { diff --git a/Libraries/LibHTML/Layout/LineBox.h b/Libraries/LibWeb/Layout/LineBox.h similarity index 97% rename from Libraries/LibHTML/Layout/LineBox.h rename to Libraries/LibWeb/Layout/LineBox.h index b7ea2ac3318..e5322c0e153 100644 --- a/Libraries/LibHTML/Layout/LineBox.h +++ b/Libraries/LibWeb/Layout/LineBox.h @@ -27,7 +27,7 @@ #pragma once #include -#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LineBoxFragment.cpp b/Libraries/LibWeb/Layout/LineBoxFragment.cpp similarity index 94% rename from Libraries/LibHTML/Layout/LineBoxFragment.cpp rename to Libraries/LibWeb/Layout/LineBoxFragment.cpp index 1491e1db754..2d7a60c9179 100644 --- a/Libraries/LibHTML/Layout/LineBoxFragment.cpp +++ b/Libraries/LibWeb/Layout/LineBoxFragment.cpp @@ -26,10 +26,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/Layout/LineBoxFragment.h b/Libraries/LibWeb/Layout/LineBoxFragment.h similarity index 100% rename from Libraries/LibHTML/Layout/LineBoxFragment.h rename to Libraries/LibWeb/Layout/LineBoxFragment.h diff --git a/Libraries/LibHTML/Makefile b/Libraries/LibWeb/Makefile similarity index 93% rename from Libraries/LibHTML/Makefile rename to Libraries/LibWeb/Makefile index 5c421edf70e..40d6899fbd3 100644 --- a/Libraries/LibHTML/Makefile +++ b/Libraries/LibWeb/Makefile @@ -1,4 +1,4 @@ -LIBHTML_OBJS = \ +LIBWEB_OBJS = \ CSS/DefaultStyleSheetSource.o \ CSS/PropertyID.o \ CSS/Selector.o \ @@ -95,14 +95,14 @@ ResourceLoader.cpp: ../../Servers/ProtocolServer/ProtocolClientEndpoint.h ../../ EXTRA_CLEAN = CSS/DefaultStyleSheetSource.cpp CSS/PropertyID.h CSS/PropertyID.cpp -OBJS = $(EXTRA_OBJS) $(LIBHTML_OBJS) +OBJS = $(EXTRA_OBJS) $(LIBWEB_OBJS) -LIBRARY = libhtml.a +LIBRARY = libweb.a install: for dir in . Parser DOM CSS Layout; do \ - mkdir -p $(SERENITY_BASE_DIR)/Root/usr/include/LibHTML/$$dir; \ - cp $$dir/*.h $(SERENITY_BASE_DIR)/Root/usr/include/LibHTML/$$dir/; \ + mkdir -p $(SERENITY_BASE_DIR)/Root/usr/include/LibWeb/$$dir; \ + cp $$dir/*.h $(SERENITY_BASE_DIR)/Root/usr/include/LibWeb/$$dir/; \ done cp $(LIBRARY) $(SERENITY_BASE_DIR)/Root/usr/lib/ diff --git a/Libraries/LibHTML/Parser/CSSParser.cpp b/Libraries/LibWeb/Parser/CSSParser.cpp similarity index 99% rename from Libraries/LibHTML/Parser/CSSParser.cpp rename to Libraries/LibWeb/Parser/CSSParser.cpp index d670cf3c1d0..e40618f1164 100644 --- a/Libraries/LibHTML/Parser/CSSParser.cpp +++ b/Libraries/LibWeb/Parser/CSSParser.cpp @@ -25,9 +25,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/Libraries/LibHTML/Parser/CSSParser.h b/Libraries/LibWeb/Parser/CSSParser.h similarity index 97% rename from Libraries/LibHTML/Parser/CSSParser.h rename to Libraries/LibWeb/Parser/CSSParser.h index 260a9c372f8..287c2931e06 100644 --- a/Libraries/LibHTML/Parser/CSSParser.h +++ b/Libraries/LibWeb/Parser/CSSParser.h @@ -27,7 +27,7 @@ #pragma once #include -#include +#include namespace Web { diff --git a/Libraries/LibHTML/Parser/HTMLParser.cpp b/Libraries/LibWeb/Parser/HTMLParser.cpp similarity index 97% rename from Libraries/LibHTML/Parser/HTMLParser.cpp rename to Libraries/LibWeb/Parser/HTMLParser.cpp index 6f24a5277a9..f94edd833f2 100644 --- a/Libraries/LibHTML/Parser/HTMLParser.cpp +++ b/Libraries/LibWeb/Parser/HTMLParser.cpp @@ -27,13 +27,13 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/Libraries/LibHTML/Parser/HTMLParser.h b/Libraries/LibWeb/Parser/HTMLParser.h similarity index 97% rename from Libraries/LibHTML/Parser/HTMLParser.h rename to Libraries/LibWeb/Parser/HTMLParser.h index a3077f14cf9..60d234f87c1 100644 --- a/Libraries/LibHTML/Parser/HTMLParser.h +++ b/Libraries/LibWeb/Parser/HTMLParser.h @@ -27,7 +27,7 @@ #pragma once #include -#include +#include namespace Web { diff --git a/Libraries/LibHTML/RenderingContext.h b/Libraries/LibWeb/RenderingContext.h similarity index 100% rename from Libraries/LibHTML/RenderingContext.h rename to Libraries/LibWeb/RenderingContext.h diff --git a/Libraries/LibHTML/ResourceLoader.cpp b/Libraries/LibWeb/ResourceLoader.cpp similarity index 98% rename from Libraries/LibHTML/ResourceLoader.cpp rename to Libraries/LibWeb/ResourceLoader.cpp index 9e23aa6a32f..ac11e40da01 100644 --- a/Libraries/LibHTML/ResourceLoader.cpp +++ b/Libraries/LibWeb/ResourceLoader.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/Libraries/LibHTML/ResourceLoader.h b/Libraries/LibWeb/ResourceLoader.h similarity index 100% rename from Libraries/LibHTML/ResourceLoader.h rename to Libraries/LibWeb/ResourceLoader.h diff --git a/Libraries/LibHTML/Scripts/GenerateStyleSheetSource.sh b/Libraries/LibWeb/Scripts/GenerateStyleSheetSource.sh similarity index 100% rename from Libraries/LibHTML/Scripts/GenerateStyleSheetSource.sh rename to Libraries/LibWeb/Scripts/GenerateStyleSheetSource.sh diff --git a/Libraries/LibHTML/StylePropertiesModel.cpp b/Libraries/LibWeb/StylePropertiesModel.cpp similarity index 95% rename from Libraries/LibHTML/StylePropertiesModel.cpp rename to Libraries/LibWeb/StylePropertiesModel.cpp index 0bf7152be97..5df5df30c4f 100644 --- a/Libraries/LibHTML/StylePropertiesModel.cpp +++ b/Libraries/LibWeb/StylePropertiesModel.cpp @@ -25,9 +25,9 @@ */ #include "StylePropertiesModel.h" -#include -#include -#include +#include +#include +#include namespace Web { diff --git a/Libraries/LibHTML/StylePropertiesModel.h b/Libraries/LibWeb/StylePropertiesModel.h similarity index 100% rename from Libraries/LibHTML/StylePropertiesModel.h rename to Libraries/LibWeb/StylePropertiesModel.h diff --git a/Libraries/LibHTML/TreeNode.h b/Libraries/LibWeb/TreeNode.h similarity index 100% rename from Libraries/LibHTML/TreeNode.h rename to Libraries/LibWeb/TreeNode.h diff --git a/ReadMe.md b/ReadMe.md index fa42afca65f..b7d914ad237 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -49,7 +49,7 @@ I'm also on [Patreon](https://www.patreon.com/serenityos) and [GitHub Sponsors]( * 2D graphics library (LibGfx) * GUI toolkit (LibGUI) * Cross-process communication library (LibIPC) -* HTML/CSS engine (LibHTML) +* HTML/CSS engine (LibWeb) * Markdown (LibMarkdown) * Audio (LibAudio) * PCI database (LibPCIDB) diff --git a/Userland/Makefile b/Userland/Makefile index 717c41425b4..8b60b9693ad 100644 --- a/Userland/Makefile +++ b/Userland/Makefile @@ -4,7 +4,7 @@ APPS = ${SRCS:.cpp=} EXTRA_CLEAN = $(APPS) -LIB_DEPS = HTML GUI Gfx Audio Protocol IPC Thread Pthread Core PCIDB Markdown +LIB_DEPS = Web GUI Gfx Audio Protocol IPC Thread Pthread Core PCIDB Markdown include ../Makefile.common diff --git a/Userland/html.cpp b/Userland/html.cpp index 71f1c7fc997..9af204fbaa3 100644 --- a/Userland/html.cpp +++ b/Userland/html.cpp @@ -32,15 +32,15 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include int main(int argc, char** argv)