LibWeb: Remove the flex item size cache

This was overly permissive as the FIXME stated and was causing layout
issues.
This commit is contained in:
sin-ack 2022-09-18 16:37:51 +00:00 committed by Andreas Kling
parent 97b5230413
commit e9d5d2f74b
Notes: sideshowbarker 2024-07-17 09:49:48 +09:00
2 changed files with 1 additions and 12 deletions

View File

@ -713,16 +713,7 @@ void FlexFormattingContext::determine_flex_base_size_and_hypothetical_main_size(
if (has_definite_main_size(child_box))
return resolved_definite_main_size(flex_item);
// NOTE: To avoid repeated layout work, we keep a cache of flex item main sizes on the
// root LayoutState object. It's available through a full layout cycle.
// FIXME: Make sure this cache isn't overly permissive..
auto& size_cache = m_state.m_root.flex_item_size_cache;
auto it = size_cache.find(&flex_item.box);
if (it != size_cache.end())
return it->value;
auto main_size = calculate_indefinite_main_size(flex_item);
size_cache.set(&flex_item.box, main_size);
return main_size;
return calculate_indefinite_main_size(flex_item);
}();
// The hypothetical main size is the items flex base size clamped according to its used min and max main sizes (and flooring the content box size at zero).

View File

@ -148,8 +148,6 @@ struct LayoutState {
HashMap<NodeWithStyleAndBoxModelMetrics const*, NonnullOwnPtr<IntrinsicSizes>> mutable intrinsic_sizes;
HashMap<Box const*, float> mutable flex_item_size_cache;
LayoutState const* m_parent { nullptr };
LayoutState const& m_root;
};