Skip to content

Commit

Permalink
LibWeb: Cache flex item main sizes to avoid relayout during same cycle
Browse files Browse the repository at this point in the history
This makes twitter.com actually load & render (although not very well.)
  • Loading branch information
awesomekling committed Jul 5, 2022
1 parent 8733fba commit d2b7d24
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
11 changes: 10 additions & 1 deletion Userland/Libraries/LibWeb/Layout/FlexFormattingContext.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,16 @@ void FlexFormattingContext::determine_flex_base_size_and_hypothetical_main_size(
if (has_definite_main_size(child_box))
return specified_main_size_of_child_box(child_box);

return calculate_indefinite_main_size(flex_item);
// NOTE: To avoid repeated layout work, we keep a cache of flex item main sizes on the
// root FormattingState 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;
}();

// The hypothetical main size is the item’s flex base size clamped according to its used min and max main sizes (and flooring the content box size at zero).
Expand Down
2 changes: 2 additions & 0 deletions Userland/Libraries/LibWeb/Layout/FormattingState.h
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ struct FormattingState {
};
HashMap<NodeWithStyleAndBoxModelMetrics const*, IntrinsicSizes> mutable intrinsic_sizes;

HashMap<Box const*, float> mutable flex_item_size_cache;

FormattingState const* m_parent { nullptr };
FormattingState const& m_root;
};
Expand Down

0 comments on commit d2b7d24

Please sign in to comment.