diff --git a/Userland/Libraries/LibWeb/DOM/Document.cpp b/Userland/Libraries/LibWeb/DOM/Document.cpp index 3f4f271ced..19b26b042b 100644 --- a/Userland/Libraries/LibWeb/DOM/Document.cpp +++ b/Userland/Libraries/LibWeb/DOM/Document.cpp @@ -342,7 +342,7 @@ void Document::visit_edges(Cell::Visitor& visitor) visitor.visit(m_scripts); visitor.visit(m_all); visitor.visit(m_selection); - + visitor.visit(m_first_base_element_with_href_in_tree_order); visitor.visit(m_parser); for (auto& script : m_scripts_to_execute_when_parsing_has_finished) @@ -732,7 +732,7 @@ Vector const* Document::background_layers() const return &body_layout_node->background_layers(); } -JS::GCPtr Document::first_base_element_with_href_in_tree_order() const +void Document::update_base_element(Badge) { JS::GCPtr base_element; @@ -745,7 +745,12 @@ JS::GCPtr Document::first_base_element_with_href_in_tree_ return IterationDecision::Continue; }); - return base_element; + m_first_base_element_with_href_in_tree_order = base_element; +} + +JS::GCPtr Document::first_base_element_with_href_in_tree_order() const +{ + return m_first_base_element_with_href_in_tree_order; } // https://html.spec.whatwg.org/multipage/urls-and-fetching.html#fallback-base-url diff --git a/Userland/Libraries/LibWeb/DOM/Document.h b/Userland/Libraries/LibWeb/DOM/Document.h index 14e667559c..fcab4c06b9 100644 --- a/Userland/Libraries/LibWeb/DOM/Document.h +++ b/Userland/Libraries/LibWeb/DOM/Document.h @@ -107,6 +107,7 @@ public: AK::URL fallback_base_url() const; AK::URL base_url() const; + void update_base_element(Badge); JS::GCPtr first_base_element_with_href_in_tree_order() const; String url_string() const { return m_url.to_string(); } @@ -601,6 +602,9 @@ private: // https://w3c.github.io/selection-api/#dfn-selection JS::GCPtr m_selection; + + // NOTE: This is a cache to make finding the first element O(1). + JS::GCPtr m_first_base_element_with_href_in_tree_order; }; } diff --git a/Userland/Libraries/LibWeb/HTML/HTMLBaseElement.cpp b/Userland/Libraries/LibWeb/HTML/HTMLBaseElement.cpp index 19f28a84fc..675442986f 100644 --- a/Userland/Libraries/LibWeb/HTML/HTMLBaseElement.cpp +++ b/Userland/Libraries/LibWeb/HTML/HTMLBaseElement.cpp @@ -21,6 +21,8 @@ void HTMLBaseElement::inserted() { HTMLElement::inserted(); + document().update_base_element({}); + // The frozen base URL must be immediately set for an element whenever any of the following situations occur: // - The base element becomes the first base element in tree order with an href content attribute in its Document. @@ -30,6 +32,12 @@ void HTMLBaseElement::inserted() set_the_frozen_base_url(); } +void HTMLBaseElement::removed_from(Node* parent) +{ + HTMLElement::removed_from(parent); + document().update_base_element({}); +} + void HTMLBaseElement::parse_attribute(FlyString const& name, String const& value) { HTMLElement::parse_attribute(name, value); @@ -39,6 +47,8 @@ void HTMLBaseElement::parse_attribute(FlyString const& name, String const& value if (name != AttributeNames::href) return; + document().update_base_element({}); + auto first_base_element_with_href_in_document = document().first_base_element_with_href_in_tree_order(); if (first_base_element_with_href_in_document.ptr() == this) set_the_frozen_base_url(); diff --git a/Userland/Libraries/LibWeb/HTML/HTMLBaseElement.h b/Userland/Libraries/LibWeb/HTML/HTMLBaseElement.h index 58c7e6be33..8b5a02ca98 100644 --- a/Userland/Libraries/LibWeb/HTML/HTMLBaseElement.h +++ b/Userland/Libraries/LibWeb/HTML/HTMLBaseElement.h @@ -22,6 +22,7 @@ public: AK::URL const& frozen_base_url() const { return m_frozen_base_url; } virtual void inserted() override; + virtual void removed_from(Node*) override; virtual void parse_attribute(FlyString const& name, String const& value) override; private: