LibWeb: Bring BackgroundStyleValue::to_string() to spec
This now outputs valid CSS representing the background, instead of confusing debug info. We can't guarantee that all the longhands have the same number of values, since while that's always the case when parsing, we also create BackgroundStyleValues when producing the resolved style, which just combines the longhands together.
This commit is contained in:
Sam Atkins
Andreas Kling
parent
72d080b4ba
commit
c052457498
Notes:
sideshowbarker
2024-07-18 01:02:35 +09:00
Author: https://github.com/AtkinsSJ Commit: https://github.com/SerenityOS/serenity/commit/c052457498a Pull-request: https://github.com/SerenityOS/serenity/pull/10946
2 changed files with 74 additions and 16 deletions
Userland/Libraries/LibWeb/CSS
|
|
@ -181,6 +181,66 @@ StyleValueList const& StyleValue::as_value_list() const
|
|||
return static_cast<StyleValueList const&>(*this);
|
||||
}
|
||||
|
||||
BackgroundStyleValue::BackgroundStyleValue(
|
||||
NonnullRefPtr<StyleValue> color,
|
||||
NonnullRefPtr<StyleValue> image,
|
||||
NonnullRefPtr<StyleValue> position,
|
||||
NonnullRefPtr<StyleValue> size,
|
||||
NonnullRefPtr<StyleValue> repeat,
|
||||
NonnullRefPtr<StyleValue> attachment,
|
||||
NonnullRefPtr<StyleValue> origin,
|
||||
NonnullRefPtr<StyleValue> clip)
|
||||
: StyleValue(Type::Background)
|
||||
, m_color(color)
|
||||
, m_image(image)
|
||||
, m_position(position)
|
||||
, m_size(size)
|
||||
, m_repeat(repeat)
|
||||
, m_attachment(attachment)
|
||||
, m_origin(origin)
|
||||
, m_clip(clip)
|
||||
{
|
||||
auto layer_count = [](auto style_value) -> size_t {
|
||||
if (style_value->is_value_list())
|
||||
return style_value->as_value_list().size();
|
||||
else
|
||||
return 1;
|
||||
};
|
||||
|
||||
m_layer_count = max(layer_count(m_image), layer_count(m_position));
|
||||
m_layer_count = max(m_layer_count, layer_count(m_size));
|
||||
m_layer_count = max(m_layer_count, layer_count(m_repeat));
|
||||
m_layer_count = max(m_layer_count, layer_count(m_attachment));
|
||||
m_layer_count = max(m_layer_count, layer_count(m_origin));
|
||||
m_layer_count = max(m_layer_count, layer_count(m_clip));
|
||||
|
||||
VERIFY(!m_color->is_value_list());
|
||||
}
|
||||
|
||||
String BackgroundStyleValue::to_string() const
|
||||
{
|
||||
if (m_layer_count == 1) {
|
||||
return String::formatted("{} {} {} {} {} {} {} {}", m_color->to_string(), m_image->to_string(), m_position->to_string(), m_size->to_string(), m_repeat->to_string(), m_attachment->to_string(), m_origin->to_string(), m_clip->to_string());
|
||||
}
|
||||
|
||||
auto get_layer_value_string = [](NonnullRefPtr<StyleValue> const& style_value, size_t index) {
|
||||
if (style_value->is_value_list())
|
||||
return style_value->as_value_list().value_at(index, true)->to_string();
|
||||
return style_value->to_string();
|
||||
};
|
||||
|
||||
StringBuilder builder;
|
||||
for (size_t i = 0; i < m_layer_count; i++) {
|
||||
if (i)
|
||||
builder.append(", ");
|
||||
if (i == m_layer_count - 1)
|
||||
builder.appendff("{} ", m_color->to_string());
|
||||
builder.appendff("{} {} {} {} {} {} {}", get_layer_value_string(m_image, i), get_layer_value_string(m_position, i), get_layer_value_string(m_size, i), get_layer_value_string(m_repeat, i), get_layer_value_string(m_attachment, i), get_layer_value_string(m_origin, i), get_layer_value_string(m_clip, i));
|
||||
}
|
||||
|
||||
return builder.to_string();
|
||||
}
|
||||
|
||||
String IdentifierStyleValue::to_string() const
|
||||
{
|
||||
return CSS::string_from_value_id(m_id);
|
||||
|
|
|
|||
|
|
@ -408,6 +408,8 @@ public:
|
|||
}
|
||||
virtual ~BackgroundStyleValue() override { }
|
||||
|
||||
size_t layer_count() const { return m_layer_count; }
|
||||
|
||||
NonnullRefPtr<StyleValue> attachment() const { return m_attachment; }
|
||||
NonnullRefPtr<StyleValue> clip() const { return m_clip; }
|
||||
NonnullRefPtr<StyleValue> color() const { return m_color; }
|
||||
|
|
@ -417,10 +419,7 @@ public:
|
|||
NonnullRefPtr<StyleValue> repeat() const { return m_repeat; }
|
||||
NonnullRefPtr<StyleValue> size() const { return m_size; }
|
||||
|
||||
virtual String to_string() const override
|
||||
{
|
||||
return String::formatted("{} {} {} {} {} {} {} {}", m_color->to_string(), m_image->to_string(), m_position->to_string(), m_size->to_string(), m_repeat->to_string(), m_attachment->to_string(), m_origin->to_string(), m_clip->to_string());
|
||||
}
|
||||
virtual String to_string() const override;
|
||||
|
||||
private:
|
||||
BackgroundStyleValue(
|
||||
|
|
@ -431,18 +430,8 @@ private:
|
|||
NonnullRefPtr<StyleValue> repeat,
|
||||
NonnullRefPtr<StyleValue> attachment,
|
||||
NonnullRefPtr<StyleValue> origin,
|
||||
NonnullRefPtr<StyleValue> clip)
|
||||
: StyleValue(Type::Background)
|
||||
, m_color(color)
|
||||
, m_image(image)
|
||||
, m_position(position)
|
||||
, m_size(size)
|
||||
, m_repeat(repeat)
|
||||
, m_attachment(attachment)
|
||||
, m_origin(origin)
|
||||
, m_clip(clip)
|
||||
{
|
||||
}
|
||||
NonnullRefPtr<StyleValue> clip);
|
||||
|
||||
NonnullRefPtr<StyleValue> m_color;
|
||||
NonnullRefPtr<StyleValue> m_image;
|
||||
NonnullRefPtr<StyleValue> m_position;
|
||||
|
|
@ -451,6 +440,8 @@ private:
|
|||
NonnullRefPtr<StyleValue> m_attachment;
|
||||
NonnullRefPtr<StyleValue> m_origin;
|
||||
NonnullRefPtr<StyleValue> m_clip;
|
||||
|
||||
size_t m_layer_count;
|
||||
};
|
||||
|
||||
class PositionStyleValue final : public StyleValue {
|
||||
|
|
@ -1321,7 +1312,14 @@ class StyleValueList final : public StyleValue {
|
|||
public:
|
||||
static NonnullRefPtr<StyleValueList> create(NonnullRefPtrVector<StyleValue>&& values) { return adopt_ref(*new StyleValueList(move(values))); }
|
||||
|
||||
size_t size() const { return m_values.size(); }
|
||||
NonnullRefPtrVector<StyleValue> const& values() const { return m_values; }
|
||||
NonnullRefPtr<StyleValue> value_at(size_t i, bool allow_loop) const
|
||||
{
|
||||
if (allow_loop)
|
||||
return m_values[i % size()];
|
||||
return m_values[i];
|
||||
}
|
||||
|
||||
virtual String to_string() const
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue