beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-25 00:50:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

LibWeb: Use available space to resolve sizes in FFC

Browse source 
If available space is definite it should always match the size of the
containing block. Therefore, there is no need to do containing block
node lookup.
This commit is contained in:
Aliaksandr Kalenik 2024-11-09 20:42:53 +01:00 committed by Andreas Kling
parent 5aa1d7837f
commit dd11d48a1d
Notes: github-actions[bot] 2024-11-10 18:15:48 +00:00 
Author: https://github.com/kalenikaliaksandr
Commit: https://github.com/LadybirdBrowser/ladybird/commit/dd11d48a1dc
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/2258
7 changed files with 11 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Libraries/LibWeb/Layout/FlexFormattingContext.cpp
View file

@ -20,12 +20,12 @@ namespace Web::Layout {
CSSPixels FlexFormattingContext::get_pixel_width(Box const& box, CSS::Size const& size) const
{
return calculate_inner_width(box, containing_block_width_as_available_size(box), size);
return calculate_inner_width(box, m_available_space->width, size);
}
CSSPixels FlexFormattingContext::get_pixel_height(Box const& box, CSS::Size const& size) const
{
return calculate_inner_height(box, containing_block_height_as_available_size(box), size);
return calculate_inner_height(box, m_available_space->height, size);
}
FlexFormattingContext::FlexFormattingContext(LayoutState& state, LayoutMode layout_mode, Box const& flex_container, FormattingContext* parent)
@ -51,6 +51,8 @@ void FlexFormattingContext::run(AvailableSpace const& available_space)
{
// This implements https://www.w3.org/TR/css-flexbox-1/#layout-algorithm
m_available_space = available_space;
// 1. Generate anonymous flex items
generate_anonymous_flex_items();

1
Libraries/LibWeb/Layout/FlexFormattingContext.h
View file

@ -235,6 +235,7 @@ private:
AvailableSpace space;
};
Optional<AxisAgnosticAvailableSpace> m_available_space_for_items;
Optional<AvailableSpace> m_available_space;
};
}

28
Libraries/LibWeb/Layout/FormattingContext.cpp
View file

@ -1655,34 +1655,6 @@ CSSPixels FormattingContext::containing_block_height_for(NodeWithStyleAndBoxMode
VERIFY_NOT_REACHED();
}
AvailableSize FormattingContext::containing_block_width_as_available_size(NodeWithStyleAndBoxModelMetrics const& node) const
{
auto const& used_values = m_state.get(node);
switch (used_values.width_constraint) {
case SizeConstraint::MinContent:
return AvailableSize::make_min_content();
case SizeConstraint::MaxContent:
return AvailableSize::make_max_content();
case SizeConstraint::None:
return AvailableSize::make_definite(used_values.containing_block_used_values()->content_width());
}
VERIFY_NOT_REACHED();
}
AvailableSize FormattingContext::containing_block_height_as_available_size(NodeWithStyleAndBoxModelMetrics const& node) const
{
auto const& used_values = m_state.get(node);
switch (used_values.height_constraint) {
case SizeConstraint::MinContent:
return AvailableSize::make_min_content();
case SizeConstraint::MaxContent:
return AvailableSize::make_max_content();
case SizeConstraint::None:
return AvailableSize::make_definite(used_values.containing_block_used_values()->content_height());
}
VERIFY_NOT_REACHED();
}
// https://drafts.csswg.org/css-sizing-3/#stretch-fit-size
CSSPixels FormattingContext::calculate_stretch_fit_width(Box const& box, AvailableSize const& available_width) const
{

3
Libraries/LibWeb/Layout/FormattingContext.h
View file

@ -101,9 +101,6 @@ public:
[[nodiscard]] CSSPixels containing_block_width_for(NodeWithStyleAndBoxModelMetrics const&) const;
[[nodiscard]] CSSPixels containing_block_height_for(NodeWithStyleAndBoxModelMetrics const&) const;
[[nodiscard]] AvailableSize containing_block_width_as_available_size(NodeWithStyleAndBoxModelMetrics const&) const;
[[nodiscard]] AvailableSize containing_block_height_as_available_size(NodeWithStyleAndBoxModelMetrics const&) const;
[[nodiscard]] CSSPixels calculate_stretch_fit_width(Box const&, AvailableSize const&) const;
[[nodiscard]] CSSPixels calculate_stretch_fit_height(Box const&, AvailableSize const&) const;

4
Tests/LibWeb/Text/expected/wpt-import/css/css-flexbox/flex-minimum-height-flex-items-012.txt
View file

@ -6,6 +6,6 @@ Rerun
Found 1 tests
1 Fail
1 Pass
Details
Result Test Name MessageFail .flexbox 1
Result Test Name MessagePass .flexbox 1

5
Tests/LibWeb/Text/expected/wpt-import/css/css-flexbox/percentage-size-quirks.txt
View file

@ -6,12 +6,11 @@ Rerun
Found 8 tests
7 Pass
1 Fail
8 Pass
Details
Result Test Name MessagePass .flexbox 1
Pass .flexbox 2
Fail .flexbox 3
Pass .flexbox 3
Pass .flexbox 4
Pass .flexbox 5
Pass .flexbox 6

5
Tests/LibWeb/Text/expected/wpt-import/css/css-flexbox/percentage-size.txt
View file

@ -6,12 +6,11 @@ Rerun
Found 8 tests
7 Pass
1 Fail
8 Pass
Details
Result Test Name MessagePass .flexbox 1
Pass .flexbox 2
Fail .flexbox 3
Pass .flexbox 3
Pass .flexbox 4
Pass .flexbox 5
Pass .flexbox 6