From 12c6ac78e20904431372dec1e81f896807c9f35a Mon Sep 17 00:00:00 2001
From: Aliaksandr Kalenik <kalenik.aliaksandr@gmail.com>
Date: Fri, 7 Mar 2025 20:37:04 +0100
Subject: [PATCH] LibWeb: Cache intrinsic sizes across layout runs

This change moves intrinsic sizes cache from
LayoutState, which is local to current layout run,
to layout nodes, so it could be reused between
layout runs. This optimization is possible because
we can guarantee that these measurements will
remain unchanged unless the style of the element
or any of its descendants changes.

For now, invalidation is implemented simply by
resetting cache on whole ancestors chain once we
figured that element needs layout update.
The case when layout is invalidated by DOM's
structural changes is covered by layout tree
invalidation that drops intrinsic sizes cache
along with layout nodes.

I measured improvement on couple websites:
- Mail list on GMail 28ms -> 6ms
- GitHub large code page 47ms -> 36ms
- Discord chat history 15ms -> 8ms
(Time does not include `commit()`)
---
 .../LibWeb/Animations/KeyframeEffect.cpp      |  2 +-
 Libraries/LibWeb/DOM/CharacterData.cpp        |  2 +-
 Libraries/LibWeb/DOM/Document.cpp             | 34 +++++------
 Libraries/LibWeb/DOM/Document.h               | 24 --------
 Libraries/LibWeb/DOM/Node.cpp                 | 23 +++++++-
 Libraries/LibWeb/DOM/Node.h                   | 26 +++++++++
 Libraries/LibWeb/HTML/HTMLImageElement.cpp    |  4 +-
 Libraries/LibWeb/HTML/HTMLVideoElement.cpp    |  2 +-
 Libraries/LibWeb/HTML/Navigable.cpp           |  4 +-
 Libraries/LibWeb/Layout/Box.h                 | 17 ++++++
 Libraries/LibWeb/Layout/FormattingContext.cpp | 58 +++++++------------
 Libraries/LibWeb/Layout/LayoutState.h         | 12 ----
 Libraries/LibWeb/SVG/SVGImageElement.cpp      |  2 +-
 13 files changed, 108 insertions(+), 102 deletions(-)

diff --git a/Libraries/LibWeb/Animations/KeyframeEffect.cpp b/Libraries/LibWeb/Animations/KeyframeEffect.cpp
index 3a776e4a136..543a827cd22 100644
--- a/Libraries/LibWeb/Animations/KeyframeEffect.cpp
+++ b/Libraries/LibWeb/Animations/KeyframeEffect.cpp
@@ -962,7 +962,7 @@ void KeyframeEffect::update_computed_properties()
     }
 
     if (invalidation.relayout)
-        document.set_needs_layout(DOM::SetNeedsLayoutReason::KeyframeEffect);
+        target->set_needs_layout_update(DOM::SetNeedsLayoutReason::KeyframeEffect);
     if (invalidation.rebuild_layout_tree)
         document.invalidate_layout_tree(DOM::InvalidateLayoutTreeReason::KeyframeEffect);
     if (invalidation.repaint) {
diff --git a/Libraries/LibWeb/DOM/CharacterData.cpp b/Libraries/LibWeb/DOM/CharacterData.cpp
index 0c008293277..663d3b1b428 100644
--- a/Libraries/LibWeb/DOM/CharacterData.cpp
+++ b/Libraries/LibWeb/DOM/CharacterData.cpp
@@ -147,7 +147,7 @@ WebIDL::ExceptionOr<void> CharacterData::replace_data(size_t offset, size_t coun
         static_cast<Layout::TextNode&>(*layout_node).invalidate_text_for_rendering();
 
         // We also need to relayout.
-        document().set_needs_layout(SetNeedsLayoutReason::CharacterDataReplaceData);
+        set_needs_layout_update(SetNeedsLayoutReason::CharacterDataReplaceData);
     }
 
     document().bump_character_data_version();
diff --git a/Libraries/LibWeb/DOM/Document.cpp b/Libraries/LibWeb/DOM/Document.cpp
index 011429087b2..97418b439ca 100644
--- a/Libraries/LibWeb/DOM/Document.cpp
+++ b/Libraries/LibWeb/DOM/Document.cpp
@@ -1211,20 +1211,6 @@ Optional<String> Document::encoding_parse_and_serialize_url(StringView url) cons
     return parsed_url->serialize();
 }
 
-void Document::set_needs_layout(SetNeedsLayoutReason reason)
-{
-    if (m_needs_layout)
-        return;
-    if constexpr (UPDATE_LAYOUT_DEBUG) {
-        // NOTE: We check some conditions here to avoid debug spam in documents that don't do layout.
-        auto navigable = this->navigable();
-        if (m_layout_root && navigable && navigable->active_document() == this)
-            dbgln_if(UPDATE_LAYOUT_DEBUG, "NEED LAYOUT {}", to_string(reason));
-    }
-    m_needs_layout = true;
-    schedule_layout_update();
-}
-
 void Document::invalidate_layout_tree(InvalidateLayoutTreeReason reason)
 {
     if (m_layout_root)
@@ -1299,7 +1285,7 @@ void Document::update_layout(UpdateLayoutReason reason)
 
     update_style();
 
-    if (!m_needs_layout && m_layout_root)
+    if (!m_needs_layout_update && m_layout_root)
         return;
 
     // NOTE: If this is a document hosting <template> contents, layout is unnecessary.
@@ -1329,11 +1315,16 @@ void Document::update_layout(UpdateLayoutReason reason)
         }
     }
 
-    // Assign each box that establishes a formatting context a list of absolutely positioned children it should take care of during layout
     m_layout_root->for_each_in_inclusive_subtree_of_type<Layout::Box>([&](auto& child) {
+        bool needs_layout_update = child.dom_node() && child.dom_node()->needs_layout_update();
+        if (needs_layout_update || child.is_anonymous()) {
+            child.reset_cached_intrinsic_sizes();
+        }
         child.clear_contained_abspos_children();
         return TraversalDecision::Continue;
     });
+
+    // Assign each box that establishes a formatting context a list of absolutely positioned children it should take care of during layout
     m_layout_root->for_each_in_inclusive_subtree([&](auto& child) {
         if (!child.is_absolutely_positioned())
             return TraversalDecision::Continue;
@@ -1396,7 +1387,10 @@ void Document::update_layout(UpdateLayoutReason reason)
         paintable()->recompute_selection_states(*range);
     }
 
-    m_needs_layout = false;
+    for_each_shadow_including_inclusive_descendant([](auto& node) {
+        node.reset_needs_layout_update();
+        return TraversalDecision::Continue;
+    });
 
     // Scrolling by zero offset will clamp scroll offset back to valid range if it was out of bounds
     // after the viewport size change.
@@ -1430,6 +1424,9 @@ void Document::update_layout(UpdateLayoutReason reason)
         }
         is_display_none = static_cast<Element&>(node).computed_properties()->display().is_none();
     }
+    if (node_invalidation.relayout) {
+        node.set_needs_layout_update(SetNeedsLayoutReason::StyleChange);
+    }
     if (node_invalidation.rebuild_layout_tree) {
         // We mark layout tree for rebuild starting from parent element to correctly invalidate
         // "display" property change to/from "contents" value.
@@ -1441,6 +1438,7 @@ void Document::update_layout(UpdateLayoutReason reason)
     }
     invalidation |= node_invalidation;
     node.set_needs_style_update(false);
+    invalidation |= node_invalidation;
 
     bool children_need_inherited_style_update = !invalidation.is_none();
     if (needs_full_style_update || node.child_needs_style_update() || children_need_inherited_style_update) {
@@ -1532,8 +1530,6 @@ void Document::update_style()
     auto invalidation = update_style_recursively(*this, style_computer(), false);
     if (!invalidation.is_none())
         invalidate_display_list();
-    if (invalidation.relayout)
-        set_needs_layout(SetNeedsLayoutReason::StyleChange);
     if (invalidation.rebuild_stacking_context_tree)
         invalidate_stacking_context_tree();
     m_needs_full_style_update = false;
diff --git a/Libraries/LibWeb/DOM/Document.h b/Libraries/LibWeb/DOM/Document.h
index 1712f306d07..4666676156f 100644
--- a/Libraries/LibWeb/DOM/Document.h
+++ b/Libraries/LibWeb/DOM/Document.h
@@ -50,26 +50,6 @@ enum class QuirksMode {
     Yes
 };
 
-#define ENUMERATE_SET_NEEDS_LAYOUT_REASONS(X)         \
-    X(CharacterDataReplaceData)                       \
-    X(FinalizeACrossDocumentNavigation)               \
-    X(HTMLImageElementReactToChangesInTheEnvironment) \
-    X(HTMLImageElementUpdateTheImageData)             \
-    X(HTMLVideoElementSetVideoTrack)                  \
-    X(KeyframeEffect)                                 \
-    X(LayoutTreeUpdate)                               \
-    X(NavigableSetViewportSize)                       \
-    X(SVGImageElementFetchTheDocument)                \
-    X(StyleChange)
-
-enum class SetNeedsLayoutReason {
-#define ENUMERATE_SET_NEEDS_LAYOUT_REASON(e) e,
-    ENUMERATE_SET_NEEDS_LAYOUT_REASONS(ENUMERATE_SET_NEEDS_LAYOUT_REASON)
-#undef ENUMERATE_SET_NEEDS_LAYOUT_REASON
-};
-
-[[nodiscard]] StringView to_string(SetNeedsLayoutReason);
-
 #define ENUMERATE_INVALIDATE_LAYOUT_TREE_REASONS(X)       \
     X(DocumentAddAnElementToTheTopLayer)                  \
     X(DocumentRequestAnElementToBeRemovedFromTheTopLayer) \
@@ -358,8 +338,6 @@ public:
     void update_paint_and_hit_testing_properties_if_needed();
     void update_animated_style_if_needed();
 
-    void set_needs_layout(SetNeedsLayoutReason);
-
     void invalidate_layout_tree(InvalidateLayoutTreeReason);
     void invalidate_stacking_context_tree();
 
@@ -1076,8 +1054,6 @@ private:
     // Used by evaluate_media_queries_and_report_changes().
     Vector<WeakPtr<CSS::MediaQueryList>> m_media_query_lists;
 
-    bool m_needs_layout { false };
-
     bool m_needs_full_style_update { false };
     bool m_needs_full_layout_tree_update { false };
 
diff --git a/Libraries/LibWeb/DOM/Node.cpp b/Libraries/LibWeb/DOM/Node.cpp
index e5c14bf0570..e13e3a148d2 100644
--- a/Libraries/LibWeb/DOM/Node.cpp
+++ b/Libraries/LibWeb/DOM/Node.cpp
@@ -1405,7 +1405,7 @@ void Node::set_needs_layout_tree_update(bool value)
                 break;
             ancestor->m_child_needs_layout_tree_update = true;
         }
-        document().set_needs_layout(SetNeedsLayoutReason::LayoutTreeUpdate);
+        set_needs_layout_update(SetNeedsLayoutReason::LayoutTreeUpdate);
     }
 }
 
@@ -1425,6 +1425,27 @@ void Node::set_needs_style_update(bool value)
     }
 }
 
+void Node::set_needs_layout_update(SetNeedsLayoutReason reason)
+{
+    if (m_needs_layout_update)
+        return;
+
+    if constexpr (UPDATE_LAYOUT_DEBUG) {
+        // NOTE: We check some conditions here to avoid debug spam in documents that don't do layout.
+        auto navigable = this->navigable();
+        if (navigable && navigable->active_document() == this)
+            dbgln_if(UPDATE_LAYOUT_DEBUG, "NEED LAYOUT {}", to_string(reason));
+    }
+
+    m_needs_layout_update = true;
+
+    for (auto* ancestor = parent_or_shadow_host(); ancestor; ancestor = ancestor->parent_or_shadow_host()) {
+        if (ancestor->m_needs_layout_update)
+            break;
+        ancestor->m_needs_layout_update = true;
+    }
+}
+
 void Node::post_connection()
 {
 }
diff --git a/Libraries/LibWeb/DOM/Node.h b/Libraries/LibWeb/DOM/Node.h
index 29e21297597..56f85c41a4a 100644
--- a/Libraries/LibWeb/DOM/Node.h
+++ b/Libraries/LibWeb/DOM/Node.h
@@ -91,6 +91,26 @@ enum class StyleInvalidationReason {
 #undef __ENUMERATE_STYLE_INVALIDATION_REASON
 };
 
+#define ENUMERATE_SET_NEEDS_LAYOUT_REASONS(X)         \
+    X(CharacterDataReplaceData)                       \
+    X(FinalizeACrossDocumentNavigation)               \
+    X(HTMLImageElementReactToChangesInTheEnvironment) \
+    X(HTMLImageElementUpdateTheImageData)             \
+    X(HTMLVideoElementSetVideoTrack)                  \
+    X(KeyframeEffect)                                 \
+    X(LayoutTreeUpdate)                               \
+    X(NavigableSetViewportSize)                       \
+    X(SVGImageElementFetchTheDocument)                \
+    X(StyleChange)
+
+enum class SetNeedsLayoutReason {
+#define ENUMERATE_SET_NEEDS_LAYOUT_REASON(e) e,
+    ENUMERATE_SET_NEEDS_LAYOUT_REASONS(ENUMERATE_SET_NEEDS_LAYOUT_REASON)
+#undef ENUMERATE_SET_NEEDS_LAYOUT_REASON
+};
+
+[[nodiscard]] StringView to_string(SetNeedsLayoutReason);
+
 class Node : public EventTarget
     , public TreeNode<Node> {
     WEB_PLATFORM_OBJECT(Node, EventTarget);
@@ -291,6 +311,10 @@ public:
     void set_needs_style_update(bool);
     void set_needs_style_update_internal(bool) { m_needs_style_update = true; }
 
+    bool needs_layout_update() const { return m_needs_layout_update; }
+    void set_needs_layout_update(SetNeedsLayoutReason);
+    void reset_needs_layout_update() { m_needs_layout_update = false; }
+
     bool child_needs_style_update() const { return m_child_needs_style_update; }
     void set_child_needs_style_update(bool b) { m_child_needs_style_update = b; }
 
@@ -528,6 +552,8 @@ protected:
     bool m_child_needs_style_update { false };
     bool m_entire_subtree_needs_style_update { false };
 
+    bool m_needs_layout_update { false };
+
     UniqueNodeID m_unique_id;
 
     // https://dom.spec.whatwg.org/#registered-observer-list
diff --git a/Libraries/LibWeb/HTML/HTMLImageElement.cpp b/Libraries/LibWeb/HTML/HTMLImageElement.cpp
index 3e416926463..7477190293f 100644
--- a/Libraries/LibWeb/HTML/HTMLImageElement.cpp
+++ b/Libraries/LibWeb/HTML/HTMLImageElement.cpp
@@ -762,7 +762,7 @@ void HTMLImageElement::add_callbacks_to_image_request(GC::Ref<ImageRequest> imag
                 document().list_of_available_images().add(key, *image_data, true);
 
                 set_needs_style_update(true);
-                document().set_needs_layout(DOM::SetNeedsLayoutReason::HTMLImageElementUpdateTheImageData);
+                set_needs_layout_update(DOM::SetNeedsLayoutReason::HTMLImageElementUpdateTheImageData);
 
                 // 4. If maybe omit events is not set or previousURL is not equal to urlString, then fire an event named load at the img element.
                 if (!maybe_omit_events || previous_url != url_string.serialize())
@@ -902,7 +902,7 @@ void HTMLImageElement::react_to_changes_in_the_environment()
             image_request->prepare_for_presentation(*this);
             // FIXME: This is ad-hoc, updating the layout here should probably be handled by prepare_for_presentation().
             set_needs_style_update(true);
-            document().set_needs_layout(DOM::SetNeedsLayoutReason::HTMLImageElementReactToChangesInTheEnvironment);
+            set_needs_layout_update(DOM::SetNeedsLayoutReason::HTMLImageElementReactToChangesInTheEnvironment);
 
             // 7. Fire an event named load at the img element.
             dispatch_event(DOM::Event::create(realm(), HTML::EventNames::load));
diff --git a/Libraries/LibWeb/HTML/HTMLVideoElement.cpp b/Libraries/LibWeb/HTML/HTMLVideoElement.cpp
index 8d83f6cba7c..557b1218e1a 100644
--- a/Libraries/LibWeb/HTML/HTMLVideoElement.cpp
+++ b/Libraries/LibWeb/HTML/HTMLVideoElement.cpp
@@ -111,7 +111,7 @@ u32 HTMLVideoElement::video_height() const
 void HTMLVideoElement::set_video_track(GC::Ptr<HTML::VideoTrack> video_track)
 {
     set_needs_style_update(true);
-    document().set_needs_layout(DOM::SetNeedsLayoutReason::HTMLVideoElementSetVideoTrack);
+    set_needs_layout_update(DOM::SetNeedsLayoutReason::HTMLVideoElementSetVideoTrack);
 
     if (m_video_track)
         m_video_track->pause_video({});
diff --git a/Libraries/LibWeb/HTML/Navigable.cpp b/Libraries/LibWeb/HTML/Navigable.cpp
index b0006c7b527..45e2bd99640 100644
--- a/Libraries/LibWeb/HTML/Navigable.cpp
+++ b/Libraries/LibWeb/HTML/Navigable.cpp
@@ -2100,7 +2100,7 @@ void finalize_a_cross_document_navigation(GC::Ref<Navigable> navigable, HistoryH
     // AD-HOC: If we're inside a navigable container, let's trigger a relayout in the container document.
     //         This allows size negotiation between the containing document and SVG documents to happen.
     if (auto container = navigable->container()) {
-        container->document().set_needs_layout(DOM::SetNeedsLayoutReason::FinalizeACrossDocumentNavigation);
+        container->set_needs_layout_update(DOM::SetNeedsLayoutReason::FinalizeACrossDocumentNavigation);
     }
 }
 
@@ -2223,7 +2223,7 @@ void Navigable::set_viewport_size(CSSPixelSize size)
     if (auto document = active_document()) {
         // NOTE: Resizing the viewport changes the reference value for viewport-relative CSS lengths.
         document->invalidate_style(DOM::StyleInvalidationReason::NavigableSetViewportSize);
-        document->set_needs_layout(DOM::SetNeedsLayoutReason::NavigableSetViewportSize);
+        document->set_needs_layout_update(DOM::SetNeedsLayoutReason::NavigableSetViewportSize);
     }
 
     if (auto document = active_document()) {
diff --git a/Libraries/LibWeb/Layout/Box.h b/Libraries/LibWeb/Layout/Box.h
index e1e66472575..854e14952f2 100644
--- a/Libraries/LibWeb/Layout/Box.h
+++ b/Libraries/LibWeb/Layout/Box.h
@@ -17,6 +17,13 @@ struct LineBoxFragmentCoordinate {
     size_t fragment_index { 0 };
 };
 
+struct IntrinsicSizes {
+    Optional<CSSPixels> min_content_width;
+    Optional<CSSPixels> max_content_width;
+    HashMap<CSSPixels, Optional<CSSPixels>> min_content_height;
+    HashMap<CSSPixels, Optional<CSSPixels>> max_content_height;
+};
+
 class Box : public NodeWithStyleAndBoxModelMetrics {
     GC_CELL(Box, NodeWithStyleAndBoxModelMetrics);
 
@@ -53,6 +60,14 @@ public:
 
     virtual void visit_edges(Cell::Visitor&) override;
 
+    IntrinsicSizes& cached_intrinsic_sizes() const
+    {
+        if (!m_cached_intrinsic_sizes)
+            m_cached_intrinsic_sizes = make<IntrinsicSizes>();
+        return *m_cached_intrinsic_sizes;
+    }
+    void reset_cached_intrinsic_sizes() const { m_cached_intrinsic_sizes.clear(); }
+
 protected:
     Box(DOM::Document&, DOM::Node*, GC::Ref<CSS::ComputedProperties>);
     Box(DOM::Document&, DOM::Node*, NonnullOwnPtr<CSS::ComputedValues>);
@@ -65,6 +80,8 @@ private:
     Optional<CSSPixelFraction> m_natural_aspect_ratio;
 
     Vector<GC::Ref<Node>> m_contained_abspos_children;
+
+    OwnPtr<IntrinsicSizes> mutable m_cached_intrinsic_sizes;
 };
 
 template<>
diff --git a/Libraries/LibWeb/Layout/FormattingContext.cpp b/Libraries/LibWeb/Layout/FormattingContext.cpp
index 55d12250007..886848eeea7 100644
--- a/Libraries/LibWeb/Layout/FormattingContext.cpp
+++ b/Libraries/LibWeb/Layout/FormattingContext.cpp
@@ -1442,11 +1442,9 @@ CSSPixels FormattingContext::calculate_min_content_width(Layout::Box const& box)
     if (box.has_natural_width())
         return *box.natural_width();
 
-    auto& root_state = m_state.m_root;
-
-    auto& cache = *root_state.intrinsic_sizes.ensure(&box, [] { return adopt_own(*new LayoutState::IntrinsicSizes); });
-    if (cache.min_content_width.has_value())
-        return *cache.min_content_width;
+    auto& cache = box.cached_intrinsic_sizes().min_content_width;
+    if (cache.has_value())
+        return cache.value();
 
     LayoutState throwaway_state(&m_state);
 
@@ -1466,8 +1464,9 @@ CSSPixels FormattingContext::calculate_min_content_width(Layout::Box const& box)
 
     context->run(AvailableSpace(available_width, available_height));
 
-    cache.min_content_width = clamp_to_max_dimension_value(context->automatic_content_width());
-    return *cache.min_content_width;
+    auto min_content_width = clamp_to_max_dimension_value(context->automatic_content_width());
+    cache.emplace(min_content_width);
+    return min_content_width;
 }
 
 CSSPixels FormattingContext::calculate_max_content_width(Layout::Box const& box) const
@@ -1475,11 +1474,9 @@ CSSPixels FormattingContext::calculate_max_content_width(Layout::Box const& box)
     if (box.has_natural_width())
         return *box.natural_width();
 
-    auto& root_state = m_state.m_root;
-
-    auto& cache = *root_state.intrinsic_sizes.ensure(&box, [] { return adopt_own(*new LayoutState::IntrinsicSizes); });
-    if (cache.max_content_width.has_value())
-        return *cache.max_content_width;
+    auto& cache = box.cached_intrinsic_sizes().max_content_width;
+    if (cache.has_value())
+        return cache.value();
 
     LayoutState throwaway_state(&m_state);
 
@@ -1499,8 +1496,9 @@ CSSPixels FormattingContext::calculate_max_content_width(Layout::Box const& box)
 
     context->run(AvailableSpace(available_width, available_height));
 
-    cache.max_content_width = clamp_to_max_dimension_value(context->automatic_content_width());
-    return *cache.max_content_width;
+    auto max_content_width = clamp_to_max_dimension_value(context->automatic_content_width());
+    cache.emplace(max_content_width);
+    return max_content_width;
 }
 
 // https://www.w3.org/TR/css-sizing-3/#min-content-block-size
@@ -1513,14 +1511,9 @@ CSSPixels FormattingContext::calculate_min_content_height(Layout::Box const& box
     if (box.has_natural_height())
         return *box.natural_height();
 
-    auto get_cache_slot = [&]() -> Optional<CSSPixels>* {
-        auto& root_state = m_state.m_root;
-        auto& cache = *root_state.intrinsic_sizes.ensure(&box, [] { return adopt_own(*new LayoutState::IntrinsicSizes); });
-        return &cache.min_content_height.ensure(width);
-    };
-
-    if (auto* cache_slot = get_cache_slot(); cache_slot && cache_slot->has_value())
-        return cache_slot->value();
+    auto cache_slot = box.cached_intrinsic_sizes().min_content_height.ensure(width);
+    if (cache_slot.has_value())
+        return cache_slot.value();
 
     LayoutState throwaway_state(&m_state);
 
@@ -1537,9 +1530,7 @@ CSSPixels FormattingContext::calculate_min_content_height(Layout::Box const& box
     context->run(AvailableSpace(AvailableSize::make_definite(width), AvailableSize::make_min_content()));
 
     auto min_content_height = clamp_to_max_dimension_value(context->automatic_content_height());
-    if (auto* cache_slot = get_cache_slot()) {
-        *cache_slot = min_content_height;
-    }
+    cache_slot.emplace(min_content_height);
     return min_content_height;
 }
 
@@ -1551,14 +1542,9 @@ CSSPixels FormattingContext::calculate_max_content_height(Layout::Box const& box
     if (box.has_natural_height())
         return *box.natural_height();
 
-    auto get_cache_slot = [&]() -> Optional<CSSPixels>* {
-        auto& root_state = m_state.m_root;
-        auto& cache = *root_state.intrinsic_sizes.ensure(&box, [] { return adopt_own(*new LayoutState::IntrinsicSizes); });
-        return &cache.max_content_height.ensure(width);
-    };
-
-    if (auto* cache_slot = get_cache_slot(); cache_slot && cache_slot->has_value())
-        return cache_slot->value();
+    auto& cache_slot = box.cached_intrinsic_sizes().max_content_height.ensure(width);
+    if (cache_slot.has_value())
+        return cache_slot.value();
 
     LayoutState throwaway_state(&m_state);
 
@@ -1575,11 +1561,7 @@ CSSPixels FormattingContext::calculate_max_content_height(Layout::Box const& box
     context->run(AvailableSpace(AvailableSize::make_definite(width), AvailableSize::make_max_content()));
 
     auto max_content_height = clamp_to_max_dimension_value(context->automatic_content_height());
-
-    if (auto* cache_slot = get_cache_slot()) {
-        *cache_slot = max_content_height;
-    }
-
+    cache_slot.emplace(max_content_height);
     return max_content_height;
 }
 
diff --git a/Libraries/LibWeb/Layout/LayoutState.h b/Libraries/LibWeb/Layout/LayoutState.h
index 748c8e1a61f..3b72d989f1d 100644
--- a/Libraries/LibWeb/Layout/LayoutState.h
+++ b/Libraries/LibWeb/Layout/LayoutState.h
@@ -221,18 +221,6 @@ struct LayoutState {
 
     HashMap<GC::Ref<Layout::Node const>, NonnullOwnPtr<UsedValues>> used_values_per_layout_node;
 
-    // We cache intrinsic sizes once determined, as they will not change over the course of a full layout.
-    // This avoids computing them several times while performing flex layout.
-    struct IntrinsicSizes {
-        Optional<CSSPixels> min_content_width;
-        Optional<CSSPixels> max_content_width;
-
-        HashMap<CSSPixels, Optional<CSSPixels>> min_content_height;
-        HashMap<CSSPixels, Optional<CSSPixels>> max_content_height;
-    };
-
-    HashMap<GC::Ptr<NodeWithStyle const>, NonnullOwnPtr<IntrinsicSizes>> mutable intrinsic_sizes;
-
     LayoutState const* m_parent { nullptr };
     LayoutState const& m_root;
 
diff --git a/Libraries/LibWeb/SVG/SVGImageElement.cpp b/Libraries/LibWeb/SVG/SVGImageElement.cpp
index 338e97beebd..df84862c28a 100644
--- a/Libraries/LibWeb/SVG/SVGImageElement.cpp
+++ b/Libraries/LibWeb/SVG/SVGImageElement.cpp
@@ -168,7 +168,7 @@ void SVGImageElement::fetch_the_document(URL::URL const& url)
                 m_animation_timer->start();
             }
             set_needs_style_update(true);
-            document().set_needs_layout(DOM::SetNeedsLayoutReason::SVGImageElementFetchTheDocument);
+            set_needs_layout_update(DOM::SetNeedsLayoutReason::SVGImageElementFetchTheDocument);
 
             dispatch_event(DOM::Event::create(realm(), HTML::EventNames::load));
         },