RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 22:57:34 +00:00
Code Issues Activity Actions

LibWeb: Make sure CSS::ComputedValues has initial size values

Browse source 
Instead of using Optional<LengthPercentage>, we now use LengthPercentage
for these values. The initial values are all `auto`.

This avoids having to check `has_value()` in a ton of places.
This commit is contained in:
Andreas Kling 2022-07-07 12:36:02 +02:00
parent 734ff422ad
commit cefc931347
9 changed files with 81 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Libraries/LibWeb/Layout/InlineFormattingContext.cpp
View file

@ -124,7 +124,7 @@ void InlineFormattingContext::dimension_box_on_line(Box const& box, LayoutMode l
auto const& containing_block_state = m_state.get(containing_block());
auto& width_value = inline_block.computed_values().width();
if (!width_value.has_value() || (width_value->is_length() && width_value->length().is_auto())) {
if (width_value.is_auto()) {
auto result = calculate_shrink_to_fit_widths(inline_block);
auto available_width = containing_block_state.content_width
@ -139,17 +139,17 @@ void InlineFormattingContext::dimension_box_on_line(Box const& box, LayoutMode l
box_state.content_width = width;
} else {
auto container_width = CSS::Length::make_px(containing_block_state.content_width);
box_state.content_width = width_value->resolved(box, container_width).to_px(inline_block);
box_state.content_width = width_value.resolved(box, container_width).to_px(inline_block);
}
auto independent_formatting_context = layout_inside(inline_block, layout_mode);
auto& height_value = inline_block.computed_values().height();
if (!height_value.has_value() || (height_value->is_length() && height_value->length().is_auto())) {
if (height_value.is_auto()) {
// FIXME: (10.6.6) If 'height' is 'auto', the height depends on the element's descendants per 10.6.7.
BlockFormattingContext::compute_height(inline_block, m_state);
} else {
auto container_height = CSS::Length::make_px(containing_block_state.content_height);
box_state.content_height = height_value->resolved(box, container_height).to_px(inline_block);
box_state.content_height = height_value.resolved(box, container_height).to_px(inline_block);
}
independent_formatting_context->parent_context_did_dimension_child_root_box();