mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-08-07 08:39:22 +00:00
LibWeb: Don't serialize omitted box-shadow and text-shadow values
This commit is contained in:
Tim Ledbetter
Alexander Kalenik
parent
68d3ddb1a7
commit
d89a67ffee
Notes:
github-actions[bot]
2025-06-15 14:06:07 +00:00
Author: https://github.com/tcl3
Commit: d89a67ffee
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/5087
7 changed files with 207 additions and 31 deletions
|
|
@ -1921,26 +1921,16 @@ RefPtr<CSSStyleValue const> Parser::parse_single_shadow_value(TokenStream<Compon
|
|||
return nullptr;
|
||||
}
|
||||
|
||||
// If color is absent, default to `currentColor`
|
||||
if (!color)
|
||||
color = CSSKeywordValue::create(Keyword::Currentcolor);
|
||||
|
||||
// x/y offsets are required
|
||||
if (!offset_x || !offset_y)
|
||||
return nullptr;
|
||||
|
||||
// Other lengths default to 0
|
||||
if (!blur_radius)
|
||||
blur_radius = LengthStyleValue::create(Length::make_px(0));
|
||||
if (!spread_distance)
|
||||
spread_distance = LengthStyleValue::create(Length::make_px(0));
|
||||
|
||||
// Placement is outer by default
|
||||
if (!placement.has_value())
|
||||
placement = ShadowPlacement::Outer;
|
||||
|
||||
transaction.commit();
|
||||
return ShadowStyleValue::create(color.release_nonnull(), offset_x.release_nonnull(), offset_y.release_nonnull(), blur_radius.release_nonnull(), spread_distance.release_nonnull(), placement.release_value());
|
||||
return ShadowStyleValue::create(color, offset_x.release_nonnull(), offset_y.release_nonnull(), blur_radius, spread_distance, placement.release_value());
|
||||
}
|
||||
|
||||
RefPtr<CSSStyleValue const> Parser::parse_rotate_value(TokenStream<ComponentValue>& tokens)
|
||||
|
|
|
|||
|
|
@ -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());
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,22 +23,22 @@ enum class ShadowPlacement {
|
|||
class ShadowStyleValue final : public StyleValueWithDefaultOperators<ShadowStyleValue> {
|
||||
public:
|
||||
static ValueComparingNonnullRefPtr<ShadowStyleValue const> create(
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> color,
|
||||
ValueComparingRefPtr<CSSStyleValue const> color,
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> offset_x,
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> offset_y,
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> blur_radius,
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> spread_distance,
|
||||
ValueComparingRefPtr<CSSStyleValue const> blur_radius,
|
||||
ValueComparingRefPtr<CSSStyleValue const> spread_distance,
|
||||
ShadowPlacement placement)
|
||||
{
|
||||
return adopt_ref(*new (nothrow) ShadowStyleValue(move(color), move(offset_x), move(offset_y), move(blur_radius), move(spread_distance), placement));
|
||||
}
|
||||
virtual ~ShadowStyleValue() override = default;
|
||||
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> const& color() const { return m_properties.color; }
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> const& offset_x() const { return m_properties.offset_x; }
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> const& offset_y() const { return m_properties.offset_y; }
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> const& blur_radius() const { return m_properties.blur_radius; }
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> const& spread_distance() const { return m_properties.spread_distance; }
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> color() const;
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> offset_x() const { return m_properties.offset_x; }
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> offset_y() const { return m_properties.offset_y; }
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> blur_radius() const;
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> spread_distance() const;
|
||||
ShadowPlacement placement() const { return m_properties.placement; }
|
||||
|
||||
virtual String to_string(SerializationMode) const override;
|
||||
|
|
@ -47,11 +47,11 @@ public:
|
|||
|
||||
private:
|
||||
ShadowStyleValue(
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> color,
|
||||
ValueComparingRefPtr<CSSStyleValue const> color,
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> offset_x,
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> offset_y,
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> blur_radius,
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> spread_distance,
|
||||
ValueComparingRefPtr<CSSStyleValue const> blur_radius,
|
||||
ValueComparingRefPtr<CSSStyleValue const> spread_distance,
|
||||
ShadowPlacement placement)
|
||||
: StyleValueWithDefaultOperators(Type::Shadow)
|
||||
, m_properties {
|
||||
|
|
@ -68,11 +68,11 @@ private:
|
|||
virtual ValueComparingNonnullRefPtr<CSSStyleValue const> absolutized(CSSPixelRect const& viewport_rect, Length::FontMetrics const& font_metrics, Length::FontMetrics const& root_font_metrics) const override;
|
||||
|
||||
struct Properties {
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> color;
|
||||
ValueComparingRefPtr<CSSStyleValue const> color;
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> offset_x;
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> offset_y;
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> blur_radius;
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> spread_distance;
|
||||
ValueComparingRefPtr<CSSStyleValue const> blur_radius;
|
||||
ValueComparingRefPtr<CSSStyleValue const> spread_distance;
|
||||
ShadowPlacement placement;
|
||||
bool operator==(Properties const&) const = default;
|
||||
} m_properties;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue