diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/WrapperGenerator/IDLGenerators.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/WrapperGenerator/IDLGenerators.cpp index 1724b4b4a9..c45ff7a548 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/WrapperGenerator/IDLGenerators.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/WrapperGenerator/IDLGenerators.cpp @@ -3118,9 +3118,9 @@ void generate_prototype_implementation(IDL::Interface const& interface) #include #include #include +#include #include #include -#include #if __has_include() # include diff --git a/Userland/Libraries/LibWeb/Bindings/WindowObject.cpp b/Userland/Libraries/LibWeb/Bindings/WindowObject.cpp index 39ff55157f..89ea8ed2df 100644 --- a/Userland/Libraries/LibWeb/Bindings/WindowObject.cpp +++ b/Userland/Libraries/LibWeb/Bindings/WindowObject.cpp @@ -41,10 +41,10 @@ #include #include #include +#include #include #include #include -#include #include #include @@ -157,7 +157,7 @@ void WindowObject::visit_edges(Visitor& visitor) visitor.visit(it.value); } -Origin WindowObject::origin() const +HTML::Origin WindowObject::origin() const { return impl().associated_document().origin(); } diff --git a/Userland/Libraries/LibWeb/Bindings/WindowObject.h b/Userland/Libraries/LibWeb/Bindings/WindowObject.h index 40ed4372ee..2af38ae551 100644 --- a/Userland/Libraries/LibWeb/Bindings/WindowObject.h +++ b/Userland/Libraries/LibWeb/Bindings/WindowObject.h @@ -17,6 +17,7 @@ #include #include #include +#include #include namespace Web { @@ -38,7 +39,7 @@ public: HTML::Window& impl() { return *m_impl; } const HTML::Window& impl() const { return *m_impl; } - Origin origin() const; + HTML::Origin origin() const; LocationObject* location_object() { return m_location_object; } LocationObject const* location_object() const { return m_location_object; } diff --git a/Userland/Libraries/LibWeb/DOM/DOMImplementation.cpp b/Userland/Libraries/LibWeb/DOM/DOMImplementation.cpp index 0f350dae95..d2261f8a25 100644 --- a/Userland/Libraries/LibWeb/DOM/DOMImplementation.cpp +++ b/Userland/Libraries/LibWeb/DOM/DOMImplementation.cpp @@ -9,8 +9,8 @@ #include #include #include +#include #include -#include namespace Web::DOM { diff --git a/Userland/Libraries/LibWeb/DOM/Document.cpp b/Userland/Libraries/LibWeb/DOM/Document.cpp index 46dd53bba0..fb7f3beec9 100644 --- a/Userland/Libraries/LibWeb/DOM/Document.cpp +++ b/Userland/Libraries/LibWeb/DOM/Document.cpp @@ -56,6 +56,7 @@ #include #include #include +#include #include #include #include @@ -64,7 +65,6 @@ #include #include #include -#include #include #include #include @@ -305,14 +305,14 @@ ExceptionOr Document::close() return {}; } -Origin Document::origin() const +HTML::Origin Document::origin() const { if (!m_url.is_valid()) return {}; return { m_url.protocol(), m_url.host(), m_url.port_or_default() }; } -void Document::set_origin(Origin const& origin) +void Document::set_origin(HTML::Origin const& origin) { m_url.set_protocol(origin.protocol()); m_url.set_host(origin.host()); diff --git a/Userland/Libraries/LibWeb/DOM/Document.h b/Userland/Libraries/LibWeb/DOM/Document.h index 7beae1e601..0119d94d41 100644 --- a/Userland/Libraries/LibWeb/DOM/Document.h +++ b/Userland/Libraries/LibWeb/DOM/Document.h @@ -28,6 +28,7 @@ #include #include #include +#include #include namespace Web::DOM { @@ -82,8 +83,8 @@ public: String url_string() const { return m_url.to_string(); } String document_uri() const { return m_url.to_string(); } - Origin origin() const; - void set_origin(Origin const& origin); + HTML::Origin origin() const; + void set_origin(HTML::Origin const& origin); AK::URL parse_url(String const&) const; diff --git a/Userland/Libraries/LibWeb/DOM/Node.cpp b/Userland/Libraries/LibWeb/DOM/Node.cpp index 8f6f5a5d2e..37223854c4 100644 --- a/Userland/Libraries/LibWeb/DOM/Node.cpp +++ b/Userland/Libraries/LibWeb/DOM/Node.cpp @@ -29,11 +29,11 @@ #include #include #include +#include #include #include #include #include -#include namespace Web::DOM { diff --git a/Userland/Libraries/LibWeb/Forward.h b/Userland/Libraries/LibWeb/Forward.h index 6eec51afee..debab40be6 100644 --- a/Userland/Libraries/LibWeb/Forward.h +++ b/Userland/Libraries/LibWeb/Forward.h @@ -268,6 +268,7 @@ class ImageData; class MessageChannel; class MessageEvent; class MessagePort; +class Origin; class PageTransitionEvent; class PromiseRejectionEvent; class WorkerDebugConsoleClient; @@ -379,7 +380,6 @@ class EditEventHandler; class EventHandler; class FrameLoader; class LoadRequest; -class Origin; class Page; class PageClient; class PaintContext; diff --git a/Userland/Libraries/LibWeb/HTML/BrowsingContextContainer.cpp b/Userland/Libraries/LibWeb/HTML/BrowsingContextContainer.cpp index 255a017e39..0b40fc808a 100644 --- a/Userland/Libraries/LibWeb/HTML/BrowsingContextContainer.cpp +++ b/Userland/Libraries/LibWeb/HTML/BrowsingContextContainer.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include namespace Web::HTML { diff --git a/Userland/Libraries/LibWeb/HTML/HTMLIFrameElement.cpp b/Userland/Libraries/LibWeb/HTML/HTMLIFrameElement.cpp index 852515535c..dd4cfa9b21 100644 --- a/Userland/Libraries/LibWeb/HTML/HTMLIFrameElement.cpp +++ b/Userland/Libraries/LibWeb/HTML/HTMLIFrameElement.cpp @@ -8,8 +8,8 @@ #include #include #include +#include #include -#include namespace Web::HTML { diff --git a/Userland/Libraries/LibWeb/Origin.h b/Userland/Libraries/LibWeb/HTML/Origin.h similarity index 95% rename from Userland/Libraries/LibWeb/Origin.h rename to Userland/Libraries/LibWeb/HTML/Origin.h index 359492852f..e08f4d2fa4 100644 --- a/Userland/Libraries/LibWeb/Origin.h +++ b/Userland/Libraries/LibWeb/HTML/Origin.h @@ -9,7 +9,7 @@ #include -namespace Web { +namespace Web::HTML { class Origin { public: @@ -105,8 +105,8 @@ private: namespace AK { template<> -struct Traits : public GenericTraits { - static unsigned hash(Web::Origin const& origin) +struct Traits : public GenericTraits { + static unsigned hash(Web::HTML::Origin const& origin) { return pair_int_hash(origin.protocol().hash(), pair_int_hash(int_hash(origin.port()), origin.host().hash())); } diff --git a/Userland/Libraries/LibWeb/HTML/Scripting/Environments.h b/Userland/Libraries/LibWeb/HTML/Scripting/Environments.h index 8ae9bbca7d..e884af750a 100644 --- a/Userland/Libraries/LibWeb/HTML/Scripting/Environments.h +++ b/Userland/Libraries/LibWeb/HTML/Scripting/Environments.h @@ -14,7 +14,7 @@ #include #include #include -#include +#include namespace Web::HTML { diff --git a/Userland/Libraries/LibWeb/WebSockets/WebSocket.cpp b/Userland/Libraries/LibWeb/WebSockets/WebSocket.cpp index 4c32160716..aace7a8dd9 100644 --- a/Userland/Libraries/LibWeb/WebSockets/WebSocket.cpp +++ b/Userland/Libraries/LibWeb/WebSockets/WebSocket.cpp @@ -20,8 +20,8 @@ #include #include #include +#include #include -#include #include namespace Web::WebSockets { diff --git a/Userland/Libraries/LibWeb/XHR/XMLHttpRequest.cpp b/Userland/Libraries/LibWeb/XHR/XMLHttpRequest.cpp index 3768ff8e89..9a7b9f20bc 100644 --- a/Userland/Libraries/LibWeb/XHR/XMLHttpRequest.cpp +++ b/Userland/Libraries/LibWeb/XHR/XMLHttpRequest.cpp @@ -26,9 +26,9 @@ #include #include #include +#include #include #include -#include #include #include #include @@ -581,7 +581,7 @@ DOM::ExceptionOr XMLHttpRequest::send(Optional bod dbgln("XHR send from {} to {}", m_window->associated_document().url(), request_url); // TODO: Add support for preflight requests to support CORS requests - Origin request_url_origin = Origin(request_url.protocol(), request_url.host(), request_url.port_or_default()); + auto request_url_origin = HTML::Origin(request_url.protocol(), request_url.host(), request_url.port_or_default()); bool should_enforce_same_origin_policy = true; if (auto* page = m_window->page())