summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Userland/Libraries/LibWeb/CSS/Parser/Block.cpp12
-rw-r--r--Userland/Libraries/LibWeb/CSS/Parser/Block.h4
-rw-r--r--Userland/Libraries/LibWeb/CSS/Parser/ComponentValue.cpp4
-rw-r--r--Userland/Libraries/LibWeb/CSS/Parser/Rule.cpp2
4 files changed, 11 insertions, 11 deletions
diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Block.cpp b/Userland/Libraries/LibWeb/CSS/Parser/Block.cpp
index be951d037a..4093a9df97 100644
--- a/Userland/Libraries/LibWeb/CSS/Parser/Block.cpp
+++ b/Userland/Libraries/LibWeb/CSS/Parser/Block.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2020-2021, the SerenityOS developers.
- * Copyright (c) 2021-2022, Sam Atkins <atkinssj@serenityos.org>
+ * Copyright (c) 2021-2023, Sam Atkins <atkinssj@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@@ -17,15 +17,15 @@ Block::Block(Token token, Vector<ComponentValue>&& values)
Block::~Block() = default;
-DeprecatedString Block::to_deprecated_string() const
+ErrorOr<String> Block::to_string() const
{
StringBuilder builder;
- builder.append(m_token.bracket_string());
- builder.join(' ', m_values);
- builder.append(m_token.bracket_mirror_string());
+ TRY(builder.try_append(m_token.bracket_string()));
+ TRY(builder.try_join(' ', m_values));
+ TRY(builder.try_append(m_token.bracket_mirror_string()));
- return builder.to_deprecated_string();
+ return builder.to_string();
}
}
diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Block.h b/Userland/Libraries/LibWeb/CSS/Parser/Block.h
index 8168dc7078..1d343aca91 100644
--- a/Userland/Libraries/LibWeb/CSS/Parser/Block.h
+++ b/Userland/Libraries/LibWeb/CSS/Parser/Block.h
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2020-2021, the SerenityOS developers.
- * Copyright (c) 2021, Sam Atkins <atkinssj@serenityos.org>
+ * Copyright (c) 2021-2023, Sam Atkins <atkinssj@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@@ -32,7 +32,7 @@ public:
Vector<ComponentValue> const& values() const { return m_values; }
- DeprecatedString to_deprecated_string() const;
+ ErrorOr<String> to_string() const;
private:
Block(Token, Vector<ComponentValue>&&);
diff --git a/Userland/Libraries/LibWeb/CSS/Parser/ComponentValue.cpp b/Userland/Libraries/LibWeb/CSS/Parser/ComponentValue.cpp
index fec362999e..9b9a4adca4 100644
--- a/Userland/Libraries/LibWeb/CSS/Parser/ComponentValue.cpp
+++ b/Userland/Libraries/LibWeb/CSS/Parser/ComponentValue.cpp
@@ -30,7 +30,7 @@ DeprecatedString ComponentValue::to_deprecated_string() const
{
return m_value.visit(
[](Token const& token) { return token.to_string().release_value_but_fixme_should_propagate_errors().to_deprecated_string(); },
- [](NonnullRefPtr<Block> const& block) { return block->to_deprecated_string(); },
+ [](NonnullRefPtr<Block> const& block) { return block->to_string().release_value_but_fixme_should_propagate_errors().to_deprecated_string(); },
[](NonnullRefPtr<Function> const& function) { return function->to_deprecated_string(); });
}
@@ -41,7 +41,7 @@ ErrorOr<String> ComponentValue::to_debug_string() const
return String::formatted("Token: {}", TRY(token.to_debug_string()));
},
[](NonnullRefPtr<Block> const& block) -> ErrorOr<String> {
- return String::formatted("Block: {}", block->to_deprecated_string());
+ return String::formatted("Block: {}", TRY(block->to_string()));
},
[](NonnullRefPtr<Function> const& function) -> ErrorOr<String> {
return String::formatted("Function: {}", function->to_deprecated_string());
diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Rule.cpp b/Userland/Libraries/LibWeb/CSS/Parser/Rule.cpp
index e9cbfc1d59..9e22b28459 100644
--- a/Userland/Libraries/LibWeb/CSS/Parser/Rule.cpp
+++ b/Userland/Libraries/LibWeb/CSS/Parser/Rule.cpp
@@ -32,7 +32,7 @@ DeprecatedString Rule::to_deprecated_string() const
builder.join(' ', m_prelude);
if (m_block)
- builder.append(m_block->to_deprecated_string());
+ builder.append(m_block->to_string().release_value_but_fixme_should_propagate_errors());
else
builder.append(';');