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

LibWeb: Fix more ignored .to_string() errors in StyleValue

Browse source
This commit is contained in:
MacDue 2023-01-13 02:22:58 +00:00 • committed by Linus Groh
parent 92cea3216f
commit f428d17a17
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Userland/Libraries/LibWeb/CSS/StyleValue.cpp
View file

@ -631,16 +631,16 @@ bool CalculatedStyleValue::equals(StyleValue const& other) const
ErrorOr<String> CalculatedStyleValue::CalcNumberValue::to_string() const ErrorOr<String> CalculatedStyleValue::CalcNumberValue::to_string() const
{ {
return value.visit( return value.visit(
[](Number const& number) { return String::number(number.value()); }, [](Number const& number) -> ErrorOr<String> { return String::number(number.value()); },
[](NonnullOwnPtr<CalcNumberSum> const& sum) { return String::formatted("({})", sum->to_string()); }); [](NonnullOwnPtr<CalcNumberSum> const& sum) -> ErrorOr<String> { return String::formatted("({})", TRY(sum->to_string())); });
} }
ErrorOr<String> CalculatedStyleValue::CalcValue::to_string() const ErrorOr<String> CalculatedStyleValue::CalcValue::to_string() const
{ {
return value.visit( return value.visit(
[](Number const& number) { return String::number(number.value()); }, [](Number const& number) -> ErrorOr<String> { return String::number(number.value()); },
[](NonnullOwnPtr<CalcSum> const& sum) { return String::formatted("({})", sum->to_string()); }, [](NonnullOwnPtr<CalcSum> const& sum) -> ErrorOr<String> { return String::formatted("({})", TRY(sum->to_string())); },
[](auto const& v) { return v.to_string(); }); [](auto const& v) -> ErrorOr<String> { return v.to_string(); });
} }
ErrorOr<String> CalculatedStyleValue::CalcSum::to_string() const ErrorOr<String> CalculatedStyleValue::CalcSum::to_string() const
@ -677,9 +677,9 @@ ErrorOr<String> CalculatedStyleValue::CalcSumPartWithOperator::to_string() const
ErrorOr<String> CalculatedStyleValue::CalcProductPartWithOperator::to_string() const ErrorOr<String> CalculatedStyleValue::CalcProductPartWithOperator::to_string() const
{ {
auto value_string = value.visit( auto value_string = TRY(value.visit(
[](CalcValue const& v) { return v.to_string(); }, [](CalcValue const& v) { return v.to_string(); },
[](CalcNumberValue const& v) { return v.to_string(); }); [](CalcNumberValue const& v) { return v.to_string(); }));
return String::formatted(" {} {}", op == ProductOperation::Multiply ? "*"sv : "/"sv, value_string); return String::formatted(" {} {}", op == ProductOperation::Multiply ? "*"sv : "/"sv, value_string);
} }
@ -2347,7 +2347,7 @@ ErrorOr<String> PositionStyleValue::to_string() const
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
}; };
return String::formatted("{} {} {} {}", to_string(m_edge_x), m_offset_x.to_string(), to_string(m_edge_y), TRY(m_offset_y.to_string())); return String::formatted("{} {} {} {}", to_string(m_edge_x), TRY(m_offset_x.to_string()), to_string(m_edge_y), TRY(m_offset_y.to_string()));
} }
bool PositionStyleValue::equals(StyleValue const& other) const bool PositionStyleValue::equals(StyleValue const& other) const
@ -2384,7 +2384,7 @@ bool ResolutionStyleValue::equals(StyleValue const& other) const
ErrorOr<String> ShadowStyleValue::to_string() const ErrorOr<String> ShadowStyleValue::to_string() const
{ {
StringBuilder builder; StringBuilder builder;
builder.appendff("{} {} {} {} {}", String::from_deprecated_string(m_color.to_deprecated_string()), TRY(m_offset_x.to_string()), TRY(m_offset_y.to_string()), TRY(m_blur_radius.to_string()), TRY(m_spread_distance.to_string())); builder.appendff("{} {} {} {} {}", m_color.to_deprecated_string(), TRY(m_offset_x.to_string()), TRY(m_offset_y.to_string()), TRY(m_blur_radius.to_string()), TRY(m_spread_distance.to_string()));
if (m_placement == ShadowPlacement::Inner) if (m_placement == ShadowPlacement::Inner)
builder.append(" inset"sv); builder.append(" inset"sv);
return builder.to_string(); return builder.to_string();