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

LibWeb: Remove some unnecessary .release_value()s in StyleValue

Browse source 
And instead propagate these errors.
Also while here add my copyright (I've touched these files a lot)
This commit is contained in:
MacDue 2023-01-13 23:44:44 +00:00 • committed by Andreas Kling
parent 93c1fb0b76
commit 0c688fa117
2 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,6 +2,7 @@
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org> * Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2021-2023, Sam Atkins <atkinssj@serenityos.org> * Copyright (c) 2021-2023, Sam Atkins <atkinssj@serenityos.org>
* Copyright (c) 2021, Tobias Christiansen <tobyase@serenityos.org> * Copyright (c) 2021, Tobias Christiansen <tobyase@serenityos.org>
* Copyright (c) 2022-2023, MacDue <macdue@dueutil.tech>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -1934,14 +1935,14 @@ CSSPixelPoint PositionValue::resolved(Layout::Node const& node, CSSPixelRect con
return CSSPixelPoint { rect.x() + x, rect.y() + y }; return CSSPixelPoint { rect.x() + x, rect.y() + y };
} }
void PositionValue::serialize(StringBuilder& builder) const ErrorOr<void> PositionValue::serialize(StringBuilder& builder) const
{ {
// Note: This means our serialization with simplify any with explicit edges that are just `top left`. // Note: This means our serialization with simplify any with explicit edges that are just `top left`.
bool has_relative_edges = x_relative_to == HorizontalEdge::Right || y_relative_to == VerticalEdge::Bottom; bool has_relative_edges = x_relative_to == HorizontalEdge::Right || y_relative_to == VerticalEdge::Bottom;
if (has_relative_edges) if (has_relative_edges)
builder.append(x_relative_to == HorizontalEdge::Left ? "left "sv : "right "sv); builder.append(x_relative_to == HorizontalEdge::Left ? "left "sv : "right "sv);
horizontal_position.visit( TRY(horizontal_position.visit(
[&](HorizontalPreset preset) { [&](HorizontalPreset preset) -> ErrorOr<void> {
builder.append([&] { builder.append([&] {
switch (preset) { switch (preset) {
case HorizontalPreset::Left: case HorizontalPreset::Left:
@ -1954,15 +1955,17 @@ void PositionValue::serialize(StringBuilder& builder) const
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
} }
}()); }());
return {};
}, },
[&](LengthPercentage length_percentage) { [&](LengthPercentage length_percentage) -> ErrorOr<void> {
builder.append(length_percentage.to_string().release_value_but_fixme_should_propagate_errors()); builder.appendff(TRY(length_percentage.to_string()));
}); return {};
}));
builder.append(' '); builder.append(' ');
if (has_relative_edges) if (has_relative_edges)
builder.append(y_relative_to == VerticalEdge::Top ? "top "sv : "bottom "sv); builder.append(y_relative_to == VerticalEdge::Top ? "top "sv : "bottom "sv);
vertical_position.visit( TRY(vertical_position.visit(
[&](VerticalPreset preset) { [&](VerticalPreset preset) -> ErrorOr<void> {
builder.append([&] { builder.append([&] {
switch (preset) { switch (preset) {
case VerticalPreset::Top: case VerticalPreset::Top:
@ -1975,10 +1978,13 @@ void PositionValue::serialize(StringBuilder& builder) const
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
} }
}()); }());
return {};
}, },
[&](LengthPercentage length_percentage) { [&](LengthPercentage length_percentage) -> ErrorOr<void> {
builder.append(length_percentage.to_string().release_value_but_fixme_should_propagate_errors()); builder.append(TRY(length_percentage.to_string()));
}); return {};
}));
return {};
} }
bool PositionValue::operator==(PositionValue const& other) const bool PositionValue::operator==(PositionValue const& other) const
@ -2027,7 +2033,7 @@ ErrorOr<String> RadialGradientStyleValue::to_string() const
if (m_position != PositionValue::center()) { if (m_position != PositionValue::center()) {
builder.appendff(" at "sv); builder.appendff(" at "sv);
m_position.serialize(builder); TRY(m_position.serialize(builder));
} }
builder.append(", "sv); builder.append(", "sv);
@ -2213,7 +2219,7 @@ ErrorOr<String> ConicGradientStyleValue::to_string() const
if (has_from_angle) if (has_from_angle)
builder.append(' '); builder.append(' ');
builder.appendff("at "sv); builder.appendff("at "sv);
m_position.serialize(builder); TRY(m_position.serialize(builder));
} }
if (has_from_angle || has_at_position) if (has_from_angle || has_at_position)
builder.append(", "sv); builder.append(", "sv);
@ -2464,7 +2470,7 @@ ErrorOr<String> UnresolvedStyleValue::to_string() const
{ {
StringBuilder builder; StringBuilder builder;
for (auto& value : m_values) for (auto& value : m_values)
builder.append(String::from_deprecated_string(value.to_deprecated_string()).release_value()); builder.append(value.to_deprecated_string());
return builder.to_string(); return builder.to_string();
} }

3
Userland/Libraries/LibWeb/CSS/StyleValue.h
View file

@ -2,6 +2,7 @@
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org> * Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2021, Tobias Christiansen <tobyase@serenityos.org> * Copyright (c) 2021, Tobias Christiansen <tobyase@serenityos.org>
* Copyright (c) 2021-2023, Sam Atkins <atkinssj@serenityos.org> * Copyright (c) 2021-2023, Sam Atkins <atkinssj@serenityos.org>
* Copyright (c) 2022-2023, MacDue <macdue@dueutil.tech>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -132,7 +133,7 @@ struct PositionValue {
VerticalEdge y_relative_to { VerticalEdge::Top }; VerticalEdge y_relative_to { VerticalEdge::Top };
CSSPixelPoint resolved(Layout::Node const& node, CSSPixelRect const& rect) const; CSSPixelPoint resolved(Layout::Node const& node, CSSPixelRect const& rect) const;
void serialize(StringBuilder&) const; ErrorOr<void> serialize(StringBuilder&) const;
bool operator==(PositionValue const&) const; bool operator==(PositionValue const&) const;
}; };