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

LibWeb: Support calc() values in background-position

Browse source
This commit is contained in:
MacDue 2022-12-11 11:51:00 +00:00 • committed by Andreas Kling
parent 3922349b71
commit d3588a9a2b
1 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

66
Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp
View file

@ -4262,9 +4262,6 @@ RefPtr<StyleValue> Parser::parse_single_background_position_value(TokenStream<Co
} }
}; };
LengthPercentage zero_offset = Length::make_px(0);
LengthPercentage center_offset = Percentage { 50 };
struct EdgeOffset { struct EdgeOffset {
PositionEdge edge; PositionEdge edge;
LengthPercentage offset; LengthPercentage offset;
@ -4276,6 +4273,19 @@ RefPtr<StyleValue> Parser::parse_single_background_position_value(TokenStream<Co
Optional<EdgeOffset> vertical; Optional<EdgeOffset> vertical;
bool found_center = false; bool found_center = false;
auto const center_offset = Percentage { 50 };
auto const zero_offset = Length::make_px(0);
auto value_to_length_percentage = [&](auto value) -> Optional<LengthPercentage> {
if (value->is_percentage())
return LengthPercentage { value->as_percentage().percentage() };
if (value->has_length())
return LengthPercentage { value->to_length() };
if (value->is_calculated())
return LengthPercentage { value->as_calculated() };
return {};
};
while (tokens.has_next_token()) { while (tokens.has_next_token()) {
// Check if we're done // Check if we're done
auto seen_items = (horizontal.has_value() ? 1 : 0) + (vertical.has_value() ? 1 : 0) + (found_center ? 1 : 0); auto seen_items = (horizontal.has_value() ? 1 : 0) + (vertical.has_value() ? 1 : 0) + (found_center ? 1 : 0);
@ -4289,53 +4299,43 @@ RefPtr<StyleValue> Parser::parse_single_background_position_value(TokenStream<Co
tokens.next_token(); tokens.next_token();
auto value = maybe_value.release_nonnull(); auto value = maybe_value.release_nonnull();
if (value->is_percentage()) { auto offset = value_to_length_percentage(value);
if (offset.has_value()) {
if (!horizontal.has_value()) { if (!horizontal.has_value()) {
horizontal = EdgeOffset { PositionEdge::Left, value->as_percentage().percentage(), false, true }; horizontal = EdgeOffset { PositionEdge::Left, *offset, false, true };
} else if (!vertical.has_value()) { } else if (!vertical.has_value()) {
vertical = EdgeOffset { PositionEdge::Top, value->as_percentage().percentage(), false, true }; vertical = EdgeOffset { PositionEdge::Top, *offset, false, true };
} else { } else {
return nullptr; return nullptr;
} }
continue; continue;
} }
if (value->has_length()) { auto try_parse_offset = [&](bool& offset_provided) -> LengthPercentage {
if (!horizontal.has_value()) { if (tokens.has_next_token()) {
horizontal = EdgeOffset { PositionEdge::Left, value->to_length(), false, true }; auto& token = tokens.peek_token();
} else if (!vertical.has_value()) { auto maybe_value = parse_css_value(token);
vertical = EdgeOffset { PositionEdge::Top, value->to_length(), false, true }; if (!maybe_value)
} else { return zero_offset;
return nullptr; auto offset = value_to_length_percentage(maybe_value.release_nonnull());
if (offset.has_value()) {
offset_provided = true;
tokens.next_token();
return *offset;
}
} }
continue; return zero_offset;
} };
if (value->has_identifier()) { if (value->has_identifier()) {
auto identifier = value->to_identifier(); auto identifier = value->to_identifier();
if (is_horizontal(identifier)) { if (is_horizontal(identifier)) {
LengthPercentage offset = zero_offset;
bool offset_provided = false; bool offset_provided = false;
if (tokens.has_next_token()) { auto offset = try_parse_offset(offset_provided);
auto maybe_offset = parse_dimension(tokens.peek_token());
if (maybe_offset.has_value() && maybe_offset.value().is_length_percentage()) {
offset = maybe_offset.value().length_percentage();
offset_provided = true;
tokens.next_token();
}
}
horizontal = EdgeOffset { *to_edge(identifier), offset, true, offset_provided }; horizontal = EdgeOffset { *to_edge(identifier), offset, true, offset_provided };
} else if (is_vertical(identifier)) { } else if (is_vertical(identifier)) {
LengthPercentage offset = zero_offset;
bool offset_provided = false; bool offset_provided = false;
if (tokens.has_next_token()) { auto offset = try_parse_offset(offset_provided);
auto maybe_offset = parse_dimension(tokens.peek_token());
if (maybe_offset.has_value() && maybe_offset.value().is_length_percentage()) {
offset = maybe_offset.value().length_percentage();
offset_provided = true;
tokens.next_token();
}
}
vertical = EdgeOffset { *to_edge(identifier), offset, true, offset_provided }; vertical = EdgeOffset { *to_edge(identifier), offset, true, offset_provided };
} else if (identifier == ValueID::Center) { } else if (identifier == ValueID::Center) {
found_center = true; found_center = true;