瀏覽代碼

LibWeb: Move Origin into the HTML namespace

Origin is defined in the HTML Standard, and therefore belongs into the
HTML directory and namespace in LibWeb.
https://html.spec.whatwg.org/multipage/origin.html#origin
Linus Groh 3 年之前
父節點
當前提交
22a627fc1a

+ 1 - 1
Meta/Lagom/Tools/CodeGenerators/LibWeb/WrapperGenerator/IDLGenerators.cpp

@@ -3118,9 +3118,9 @@ void generate_prototype_implementation(IDL::Interface const& interface)
 #include <LibWeb/DOM/IDLEventListener.h>
 #include <LibWeb/DOM/IDLEventListener.h>
 #include <LibWeb/DOM/NodeFilter.h>
 #include <LibWeb/DOM/NodeFilter.h>
 #include <LibWeb/DOM/Range.h>
 #include <LibWeb/DOM/Range.h>
+#include <LibWeb/HTML/Origin.h>
 #include <LibWeb/HTML/Scripting/Environments.h>
 #include <LibWeb/HTML/Scripting/Environments.h>
 #include <LibWeb/HTML/Window.h>
 #include <LibWeb/HTML/Window.h>
-#include <LibWeb/Origin.h>
 
 
 #if __has_include(<LibWeb/Bindings/@prototype_base_class@.h>)
 #if __has_include(<LibWeb/Bindings/@prototype_base_class@.h>)
 #    include <LibWeb/Bindings/@prototype_base_class@.h>
 #    include <LibWeb/Bindings/@prototype_base_class@.h>

+ 2 - 2
Userland/Libraries/LibWeb/Bindings/WindowObject.cpp

@@ -41,10 +41,10 @@
 #include <LibWeb/DOM/Event.h>
 #include <LibWeb/DOM/Event.h>
 #include <LibWeb/HTML/BrowsingContext.h>
 #include <LibWeb/HTML/BrowsingContext.h>
 #include <LibWeb/HTML/EventHandler.h>
 #include <LibWeb/HTML/EventHandler.h>
+#include <LibWeb/HTML/Origin.h>
 #include <LibWeb/HTML/Scripting/Environments.h>
 #include <LibWeb/HTML/Scripting/Environments.h>
 #include <LibWeb/HTML/Storage.h>
 #include <LibWeb/HTML/Storage.h>
 #include <LibWeb/HTML/Window.h>
 #include <LibWeb/HTML/Window.h>
-#include <LibWeb/Origin.h>
 #include <LibWeb/Page/Page.h>
 #include <LibWeb/Page/Page.h>
 #include <LibWeb/WebAssembly/WebAssemblyObject.h>
 #include <LibWeb/WebAssembly/WebAssemblyObject.h>
 
 
@@ -157,7 +157,7 @@ void WindowObject::visit_edges(Visitor& visitor)
         visitor.visit(it.value);
         visitor.visit(it.value);
 }
 }
 
 
-Origin WindowObject::origin() const
+HTML::Origin WindowObject::origin() const
 {
 {
     return impl().associated_document().origin();
     return impl().associated_document().origin();
 }
 }

+ 2 - 1
Userland/Libraries/LibWeb/Bindings/WindowObject.h

@@ -17,6 +17,7 @@
 #include <LibWeb/Bindings/CrossOriginAbstractOperations.h>
 #include <LibWeb/Bindings/CrossOriginAbstractOperations.h>
 #include <LibWeb/Forward.h>
 #include <LibWeb/Forward.h>
 #include <LibWeb/HTML/GlobalEventHandlers.h>
 #include <LibWeb/HTML/GlobalEventHandlers.h>
+#include <LibWeb/HTML/Origin.h>
 #include <LibWeb/HTML/WindowEventHandlers.h>
 #include <LibWeb/HTML/WindowEventHandlers.h>
 
 
 namespace Web {
 namespace Web {
@@ -38,7 +39,7 @@ public:
     HTML::Window& impl() { return *m_impl; }
     HTML::Window& impl() { return *m_impl; }
     const HTML::Window& impl() const { 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* location_object() { return m_location_object; }
     LocationObject const* location_object() const { return m_location_object; }
     LocationObject const* location_object() const { return m_location_object; }

+ 1 - 1
Userland/Libraries/LibWeb/DOM/DOMImplementation.cpp

@@ -9,8 +9,8 @@
 #include <LibWeb/DOM/DocumentType.h>
 #include <LibWeb/DOM/DocumentType.h>
 #include <LibWeb/DOM/ElementFactory.h>
 #include <LibWeb/DOM/ElementFactory.h>
 #include <LibWeb/DOM/Text.h>
 #include <LibWeb/DOM/Text.h>
+#include <LibWeb/HTML/Origin.h>
 #include <LibWeb/Namespace.h>
 #include <LibWeb/Namespace.h>
-#include <LibWeb/Origin.h>
 
 
 namespace Web::DOM {
 namespace Web::DOM {
 
 

+ 3 - 3
Userland/Libraries/LibWeb/DOM/Document.cpp

@@ -56,6 +56,7 @@
 #include <LibWeb/HTML/HTMLScriptElement.h>
 #include <LibWeb/HTML/HTMLScriptElement.h>
 #include <LibWeb/HTML/HTMLTitleElement.h>
 #include <LibWeb/HTML/HTMLTitleElement.h>
 #include <LibWeb/HTML/MessageEvent.h>
 #include <LibWeb/HTML/MessageEvent.h>
+#include <LibWeb/HTML/Origin.h>
 #include <LibWeb/HTML/Parser/HTMLParser.h>
 #include <LibWeb/HTML/Parser/HTMLParser.h>
 #include <LibWeb/HTML/Scripting/ExceptionReporter.h>
 #include <LibWeb/HTML/Scripting/ExceptionReporter.h>
 #include <LibWeb/HTML/Scripting/WindowEnvironmentSettingsObject.h>
 #include <LibWeb/HTML/Scripting/WindowEnvironmentSettingsObject.h>
@@ -64,7 +65,6 @@
 #include <LibWeb/Layout/InitialContainingBlock.h>
 #include <LibWeb/Layout/InitialContainingBlock.h>
 #include <LibWeb/Layout/TreeBuilder.h>
 #include <LibWeb/Layout/TreeBuilder.h>
 #include <LibWeb/Namespace.h>
 #include <LibWeb/Namespace.h>
-#include <LibWeb/Origin.h>
 #include <LibWeb/Page/Page.h>
 #include <LibWeb/Page/Page.h>
 #include <LibWeb/SVG/TagNames.h>
 #include <LibWeb/SVG/TagNames.h>
 #include <LibWeb/UIEvents/EventNames.h>
 #include <LibWeb/UIEvents/EventNames.h>
@@ -305,14 +305,14 @@ ExceptionOr<void> Document::close()
     return {};
     return {};
 }
 }
 
 
-Origin Document::origin() const
+HTML::Origin Document::origin() const
 {
 {
     if (!m_url.is_valid())
     if (!m_url.is_valid())
         return {};
         return {};
     return { m_url.protocol(), m_url.host(), m_url.port_or_default() };
     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_protocol(origin.protocol());
     m_url.set_host(origin.host());
     m_url.set_host(origin.host());

+ 3 - 2
Userland/Libraries/LibWeb/DOM/Document.h

@@ -28,6 +28,7 @@
 #include <LibWeb/HTML/DocumentReadyState.h>
 #include <LibWeb/HTML/DocumentReadyState.h>
 #include <LibWeb/HTML/HTMLScriptElement.h>
 #include <LibWeb/HTML/HTMLScriptElement.h>
 #include <LibWeb/HTML/History.h>
 #include <LibWeb/HTML/History.h>
+#include <LibWeb/HTML/Origin.h>
 #include <LibWeb/HTML/Scripting/Environments.h>
 #include <LibWeb/HTML/Scripting/Environments.h>
 
 
 namespace Web::DOM {
 namespace Web::DOM {
@@ -82,8 +83,8 @@ public:
     String url_string() const { return m_url.to_string(); }
     String url_string() const { return m_url.to_string(); }
     String document_uri() 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;
     AK::URL parse_url(String const&) const;
 
 

+ 1 - 1
Userland/Libraries/LibWeb/DOM/Node.cpp

@@ -29,11 +29,11 @@
 #include <LibWeb/DOM/StaticNodeList.h>
 #include <LibWeb/DOM/StaticNodeList.h>
 #include <LibWeb/HTML/BrowsingContextContainer.h>
 #include <LibWeb/HTML/BrowsingContextContainer.h>
 #include <LibWeb/HTML/HTMLAnchorElement.h>
 #include <LibWeb/HTML/HTMLAnchorElement.h>
+#include <LibWeb/HTML/Origin.h>
 #include <LibWeb/HTML/Parser/HTMLParser.h>
 #include <LibWeb/HTML/Parser/HTMLParser.h>
 #include <LibWeb/Layout/InitialContainingBlock.h>
 #include <LibWeb/Layout/InitialContainingBlock.h>
 #include <LibWeb/Layout/Node.h>
 #include <LibWeb/Layout/Node.h>
 #include <LibWeb/Layout/TextNode.h>
 #include <LibWeb/Layout/TextNode.h>
-#include <LibWeb/Origin.h>
 
 
 namespace Web::DOM {
 namespace Web::DOM {
 
 

+ 1 - 1
Userland/Libraries/LibWeb/Forward.h

@@ -268,6 +268,7 @@ class ImageData;
 class MessageChannel;
 class MessageChannel;
 class MessageEvent;
 class MessageEvent;
 class MessagePort;
 class MessagePort;
+class Origin;
 class PageTransitionEvent;
 class PageTransitionEvent;
 class PromiseRejectionEvent;
 class PromiseRejectionEvent;
 class WorkerDebugConsoleClient;
 class WorkerDebugConsoleClient;
@@ -379,7 +380,6 @@ class EditEventHandler;
 class EventHandler;
 class EventHandler;
 class FrameLoader;
 class FrameLoader;
 class LoadRequest;
 class LoadRequest;
-class Origin;
 class Page;
 class Page;
 class PageClient;
 class PageClient;
 class PaintContext;
 class PaintContext;

+ 1 - 1
Userland/Libraries/LibWeb/HTML/BrowsingContextContainer.cpp

@@ -9,7 +9,7 @@
 #include <LibWeb/DOM/Event.h>
 #include <LibWeb/DOM/Event.h>
 #include <LibWeb/HTML/BrowsingContext.h>
 #include <LibWeb/HTML/BrowsingContext.h>
 #include <LibWeb/HTML/BrowsingContextContainer.h>
 #include <LibWeb/HTML/BrowsingContextContainer.h>
-#include <LibWeb/Origin.h>
+#include <LibWeb/HTML/Origin.h>
 #include <LibWeb/Page/Page.h>
 #include <LibWeb/Page/Page.h>
 
 
 namespace Web::HTML {
 namespace Web::HTML {

+ 1 - 1
Userland/Libraries/LibWeb/HTML/HTMLIFrameElement.cpp

@@ -8,8 +8,8 @@
 #include <LibWeb/DOM/Event.h>
 #include <LibWeb/DOM/Event.h>
 #include <LibWeb/HTML/BrowsingContext.h>
 #include <LibWeb/HTML/BrowsingContext.h>
 #include <LibWeb/HTML/HTMLIFrameElement.h>
 #include <LibWeb/HTML/HTMLIFrameElement.h>
+#include <LibWeb/HTML/Origin.h>
 #include <LibWeb/Layout/FrameBox.h>
 #include <LibWeb/Layout/FrameBox.h>
-#include <LibWeb/Origin.h>
 
 
 namespace Web::HTML {
 namespace Web::HTML {
 
 

+ 3 - 3
Userland/Libraries/LibWeb/Origin.h → Userland/Libraries/LibWeb/HTML/Origin.h

@@ -9,7 +9,7 @@
 
 
 #include <AK/String.h>
 #include <AK/String.h>
 
 
-namespace Web {
+namespace Web::HTML {
 
 
 class Origin {
 class Origin {
 public:
 public:
@@ -105,8 +105,8 @@ private:
 
 
 namespace AK {
 namespace AK {
 template<>
 template<>
-struct Traits<Web::Origin> : public GenericTraits<Web::Origin> {
-    static unsigned hash(Web::Origin const& origin)
+struct Traits<Web::HTML::Origin> : public GenericTraits<Web::HTML::Origin> {
+    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()));
         return pair_int_hash(origin.protocol().hash(), pair_int_hash(int_hash(origin.port()), origin.host().hash()));
     }
     }

+ 1 - 1
Userland/Libraries/LibWeb/HTML/Scripting/Environments.h

@@ -14,7 +14,7 @@
 #include <LibJS/Runtime/Realm.h>
 #include <LibJS/Runtime/Realm.h>
 #include <LibWeb/HTML/BrowsingContext.h>
 #include <LibWeb/HTML/BrowsingContext.h>
 #include <LibWeb/HTML/EventLoop/EventLoop.h>
 #include <LibWeb/HTML/EventLoop/EventLoop.h>
-#include <LibWeb/Origin.h>
+#include <LibWeb/HTML/Origin.h>
 
 
 namespace Web::HTML {
 namespace Web::HTML {
 
 

+ 1 - 1
Userland/Libraries/LibWeb/WebSockets/WebSocket.cpp

@@ -20,8 +20,8 @@
 #include <LibWeb/HTML/EventHandler.h>
 #include <LibWeb/HTML/EventHandler.h>
 #include <LibWeb/HTML/EventNames.h>
 #include <LibWeb/HTML/EventNames.h>
 #include <LibWeb/HTML/MessageEvent.h>
 #include <LibWeb/HTML/MessageEvent.h>
+#include <LibWeb/HTML/Origin.h>
 #include <LibWeb/HTML/Window.h>
 #include <LibWeb/HTML/Window.h>
-#include <LibWeb/Origin.h>
 #include <LibWeb/WebSockets/WebSocket.h>
 #include <LibWeb/WebSockets/WebSocket.h>
 
 
 namespace Web::WebSockets {
 namespace Web::WebSockets {

+ 2 - 2
Userland/Libraries/LibWeb/XHR/XMLHttpRequest.cpp

@@ -26,9 +26,9 @@
 #include <LibWeb/Fetch/AbstractOperations.h>
 #include <LibWeb/Fetch/AbstractOperations.h>
 #include <LibWeb/HTML/EventHandler.h>
 #include <LibWeb/HTML/EventHandler.h>
 #include <LibWeb/HTML/EventNames.h>
 #include <LibWeb/HTML/EventNames.h>
+#include <LibWeb/HTML/Origin.h>
 #include <LibWeb/HTML/Window.h>
 #include <LibWeb/HTML/Window.h>
 #include <LibWeb/Loader/ResourceLoader.h>
 #include <LibWeb/Loader/ResourceLoader.h>
-#include <LibWeb/Origin.h>
 #include <LibWeb/Page/Page.h>
 #include <LibWeb/Page/Page.h>
 #include <LibWeb/XHR/EventNames.h>
 #include <LibWeb/XHR/EventNames.h>
 #include <LibWeb/XHR/ProgressEvent.h>
 #include <LibWeb/XHR/ProgressEvent.h>
@@ -581,7 +581,7 @@ DOM::ExceptionOr<void> XMLHttpRequest::send(Optional<XMLHttpRequestBodyInit> bod
     dbgln("XHR send from {} to {}", m_window->associated_document().url(), request_url);
     dbgln("XHR send from {} to {}", m_window->associated_document().url(), request_url);
 
 
     // TODO: Add support for preflight requests to support CORS requests
     // 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;
     bool should_enforce_same_origin_policy = true;
     if (auto* page = m_window->page())
     if (auto* page = m_window->page())