1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 20:37:35 +00:00

LibWeb: Allow comma- or space-separated StyleValueLists

This lets us produce valid CSS in its to_string() method, instead of
always adding commas as before. :^)

Also, finally added a Formatter for StyleValues.
This commit is contained in:
Sam Atkins 2022-02-02 20:53:55 +00:00 committed by Andreas Kling
parent f71db4afd8
commit 5826fe094f
4 changed files with 43 additions and 25 deletions

View file

@ -1329,7 +1329,11 @@ private:
class StyleValueList final : public StyleValue {
public:
static NonnullRefPtr<StyleValueList> create(NonnullRefPtrVector<StyleValue>&& values) { return adopt_ref(*new StyleValueList(move(values))); }
enum class Separator {
Space,
Comma,
};
static NonnullRefPtr<StyleValueList> create(NonnullRefPtrVector<StyleValue>&& values, Separator separator) { return adopt_ref(*new StyleValueList(move(values), separator)); }
size_t size() const { return m_values.size(); }
NonnullRefPtrVector<StyleValue> const& values() const { return m_values; }
@ -1343,13 +1347,23 @@ public:
virtual String to_string() const override;
private:
StyleValueList(NonnullRefPtrVector<StyleValue>&& values)
StyleValueList(NonnullRefPtrVector<StyleValue>&& values, Separator separator)
: StyleValue(Type::ValueList)
, m_separator(separator)
, m_values(move(values))
{
}
Separator m_separator;
NonnullRefPtrVector<StyleValue> m_values;
};
}
template<>
struct AK::Formatter<Web::CSS::StyleValue> : Formatter<StringView> {
ErrorOr<void> format(FormatBuilder& builder, Web::CSS::StyleValue const& style_value)
{
return Formatter<StringView>::format(builder, style_value.to_string());
}
};