LibWeb: Don't serialize omitted box-shadow and text-shadow values

This commit is contained in:
Tim Ledbetter 2025-06-14 04:06:01 +01:00 committed by Alexander Kalenik
parent 68d3ddb1a7
commit d89a67ffee
Notes: github-actions[bot] 2025-06-15 14:06:07 +00:00
7 changed files with 207 additions and 31 deletions

View file

@ -8,6 +8,8 @@
*/
#include <LibWeb/CSS/Serialize.h>
#include <LibWeb/CSS/StyleValues/CSSKeywordValue.h>
#include <LibWeb/CSS/StyleValues/LengthStyleValue.h>
#include <LibWeb/CSS/StyleValues/ShadowStyleValue.h>
namespace Web::CSS {
@ -15,19 +17,56 @@ namespace Web::CSS {
String ShadowStyleValue::to_string(SerializationMode mode) const
{
StringBuilder builder;
builder.appendff("{} {} {} {} {}", m_properties.color->to_string(mode), m_properties.offset_x->to_string(mode), m_properties.offset_y->to_string(mode), m_properties.blur_radius->to_string(mode), m_properties.spread_distance->to_string(mode));
if (m_properties.color)
builder.append(m_properties.color->to_string(mode));
if (!builder.is_empty())
builder.append(' ');
builder.appendff("{} {}", m_properties.offset_x->to_string(mode), m_properties.offset_y->to_string(mode));
auto append_value = [&](ValueComparingRefPtr<CSSStyleValue const> const& value) {
if (!value)
return;
if (!builder.is_empty())
builder.append(' ');
builder.append(value->to_string(mode));
};
append_value(m_properties.blur_radius);
append_value(m_properties.spread_distance);
if (m_properties.placement == ShadowPlacement::Inner)
builder.append(" inset"sv);
return MUST(builder.to_string());
}
ValueComparingNonnullRefPtr<CSSStyleValue const> ShadowStyleValue::color() const
{
if (!m_properties.color)
return CSSKeywordValue::create(Keyword::Currentcolor);
return *m_properties.color;
}
ValueComparingNonnullRefPtr<CSSStyleValue const> ShadowStyleValue::blur_radius() const
{
if (!m_properties.blur_radius)
return LengthStyleValue::create(Length::make_px(0));
return *m_properties.blur_radius;
}
ValueComparingNonnullRefPtr<CSSStyleValue const> ShadowStyleValue::spread_distance() const
{
if (!m_properties.spread_distance)
return LengthStyleValue::create(Length::make_px(0));
return *m_properties.spread_distance;
}
ValueComparingNonnullRefPtr<CSSStyleValue const> ShadowStyleValue::absolutized(CSSPixelRect const& viewport_rect, Length::FontMetrics const& font_metrics, Length::FontMetrics const& root_font_metrics) const
{
auto absolutized_offset_x = m_properties.offset_x->absolutized(viewport_rect, font_metrics, root_font_metrics);
auto absolutized_offset_y = m_properties.offset_y->absolutized(viewport_rect, font_metrics, root_font_metrics);
auto absolutized_blur_radius = m_properties.blur_radius->absolutized(viewport_rect, font_metrics, root_font_metrics);
auto absolutized_spread_distance = m_properties.spread_distance->absolutized(viewport_rect, font_metrics, root_font_metrics);
return ShadowStyleValue::create(m_properties.color, absolutized_offset_x, absolutized_offset_y, absolutized_blur_radius, absolutized_spread_distance, m_properties.placement);
auto absolutized_offset_x = offset_x()->absolutized(viewport_rect, font_metrics, root_font_metrics);
auto absolutized_offset_y = offset_y()->absolutized(viewport_rect, font_metrics, root_font_metrics);
auto absolutized_blur_radius = blur_radius()->absolutized(viewport_rect, font_metrics, root_font_metrics);
auto absolutized_spread_distance = spread_distance()->absolutized(viewport_rect, font_metrics, root_font_metrics);
return create(color(), absolutized_offset_x, absolutized_offset_y, absolutized_blur_radius, absolutized_spread_distance, placement());
}
}