Skip to content

LibWeb; Handle calculated number values for stroke-width and stroke-dashoffset #10953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kalenikaliaksandr merged 4 commits into from
Aug 2, 2026
Merged

LibWeb; Handle calculated number values for stroke-width and stroke-dashoffset #10953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
02c67f8
LibWeb: Handle calculated number `stroke-width` values
Calme1709 Jul 31, 2026
a4712c4
LibWeb: Handle calculated number `stroke-width` values
Calme1709 Jul 31, 2026
218eb22
LibWeb: Handle calculated number `border-image-width` values
Calme1709 Jul 31, 2026
0672f9b
LibWeb: Handle calculated number `border-image-outset` values
Calme1709 Jul 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 30 additions & 4 deletions Libraries/LibWeb/CSS/ComputedProperties.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2287,6 +2287,19 @@ Optional<SVGPaint> ComputedProperties::stroke(ColorResolutionContext const& colo
return SVGPaint::from_style_value(value, color_resolution_context);
}

LengthPercentage ComputedProperties::stroke_width() const
{
auto const& value = property(PropertyID::StrokeWidth);

if (value.is_number() || (value.is_calculated() && value.as_calculated().resolves_to_number())) {
// FIXME: Converting to pixels isn't really correct - values should be in "user units"
// https://svgwg.org/svg2-draft/coords.html#TermUserUnits
return CSS::Length::make_px(CSSPixels::nearest_value_for(number_from_style_value(value, {})));
}

return CSS::LengthPercentage::from_style_value(value);
}

Vector<Variant<LengthPercentage, float>> ComputedProperties::stroke_dasharray() const
{
auto const& value = property(PropertyID::StrokeDasharray);
Expand Down Expand Up @@ -2323,6 +2336,19 @@ Vector<Variant<LengthPercentage, float>> ComputedProperties::stroke_dasharray()
return dashes;
}

LengthPercentage ComputedProperties::stroke_dashoffset() const
{
auto const& value = property(PropertyID::StrokeDashoffset);

if (value.is_number() || (value.is_calculated() && value.as_calculated().resolves_to_number())) {
// FIXME: Converting to pixels isn't really correct - values should be in "user units"
// https://svgwg.org/svg2-draft/coords.html#TermUserUnits
return CSS::Length::make_px(CSSPixels::nearest_value_for(number_from_style_value(value, {})));
}

return CSS::LengthPercentage::from_style_value(value);
}

StrokeLinecap ComputedProperties::stroke_linecap() const
{
auto const& value = property(PropertyID::StrokeLinecap);
Expand Down Expand Up @@ -2529,15 +2555,15 @@ BorderImageData ComputedProperties::border_image() const
.source = source.is_abstract_image() ? RefPtr { source.as_abstract_image() } : nullptr,
.slice = { convert_slice(slice.top()), convert_slice(slice.right()), convert_slice(slice.bottom()), convert_slice(slice.left()) },
.width = expand_sides(property(PropertyID::BorderImageWidth), [](StyleValue const& value) -> BorderImageWidthValue {
if (value.is_number())
return value.as_number().number();
if (value.is_number() || (value.is_calculated() && value.as_calculated().resolves_to_number()))
return number_from_style_value(value, {});
if (value.to_keyword() == Keyword::Auto)
return BorderImageWidthAuto {};
return LengthPercentage::from_style_value(value);
}),
.outset = expand_sides(property(PropertyID::BorderImageOutset), [](StyleValue const& value) -> BorderImageOutsetValue {
if (value.is_number())
return value.as_number().number();
if (value.is_number() || (value.is_calculated() && value.as_calculated().resolves_to_number()))
return number_from_style_value(value, {});
return Length::from_style_value(value, {});
}),
.width_value_count = component_count(property(PropertyID::BorderImageWidth)),
Expand Down
2 changes: 2 additions & 0 deletions Libraries/LibWeb/CSS/ComputedProperties.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,10 @@ class ComputedProperties final : public RefCounted<ComputedProperties> {
float fill_opacity() const;
Optional<SVGPaint> stroke(ColorResolutionContext const&) const;
Vector<Variant<LengthPercentage, float>> stroke_dasharray() const;
LengthPercentage stroke_dashoffset() const;
StrokeLinecap stroke_linecap() const;
StrokeLinejoin stroke_linejoin() const;
LengthPercentage stroke_width() const;
VectorEffect vector_effect() const;
double stroke_miterlimit() const;
float stroke_opacity() const;
Expand Down
23 changes: 5 additions & 18 deletions Libraries/LibWeb/CSS/ComputedValues.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2167,15 +2167,9 @@ NonnullRefPtr<ComputedValues const> ComputedValues::create(ComputedProperties co
if (!inherited_svg_adopted)
computed_values.set_stroke(computed_style.stroke(color_resolution_context));

auto const& stroke_width = computed_style.property(CSS::PropertyID::StrokeWidth);
// FIXME: Converting to pixels isn't really correct - values should be in "user units"
// https://svgwg.org/svg2-draft/coords.html#TermUserUnits
if (!inherited_svg_adopted) {
if (stroke_width.is_number())
computed_values.set_stroke_width(CSS::Length::make_px(CSSPixels::nearest_value_for(stroke_width.as_number().number())));
else
computed_values.set_stroke_width(CSS::LengthPercentage::from_style_value(stroke_width));
}
if (!inherited_svg_adopted)
computed_values.set_stroke_width(computed_style.stroke_width());

if (!inherited_svg_adopted) {
computed_values.set_paint_order(computed_style.paint_order());
auto const& paint_order = computed_style.property(PropertyID::PaintOrder);
Expand Down Expand Up @@ -2224,15 +2218,8 @@ NonnullRefPtr<ComputedValues const> ComputedValues::create(ComputedProperties co
if (!inherited_svg_adopted)
computed_values.set_stroke_dasharray(computed_style.stroke_dasharray());

auto const& stroke_dashoffset = computed_style.property(CSS::PropertyID::StrokeDashoffset);
// FIXME: Converting to pixels isn't really correct - values should be in "user units"
// https://svgwg.org/svg2-draft/coords.html#TermUserUnits
if (!inherited_svg_adopted) {
if (stroke_dashoffset.is_number())
computed_values.set_stroke_dashoffset(CSS::Length::make_px(CSSPixels::nearest_value_for(stroke_dashoffset.as_number().number())));
else
computed_values.set_stroke_dashoffset(CSS::LengthPercentage::from_style_value(stroke_dashoffset));
}
if (!inherited_svg_adopted)
computed_values.set_stroke_dashoffset(computed_style.stroke_dashoffset());

if (!inherited_svg_adopted)
computed_values.set_stroke_linecap(computed_style.stroke_linecap());
Expand Down
2 changes: 1 addition & 1 deletion Libraries/LibWeb/CSS/PercentageOr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class LengthPercentage {

static LengthPercentage from_style_value(NonnullRefPtr<StyleValue const> const& style_value)
{
VERIFY(style_value->is_percentage() || style_value->is_length() || style_value->is_calculated());
VERIFY(style_value->is_percentage() || style_value->is_length() || (style_value->is_calculated() && style_value->as_calculated().resolves_to_length()));
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Comment thread
sideshowbarker marked this conversation as resolved.
return from_retained_data(StyleValueFFI::rust_style_value_retain(style_value->rust_style_value_data()));
}

Expand Down
7 changes: 7 additions & 0 deletions Tests/LibWeb/Crash/CSS/calculated-number-border-image-outset.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<!doctype html>
<style>
#foo {
border-image-outset: calc(42);
}
</style>
<div id="foo"></div>
7 changes: 7 additions & 0 deletions Tests/LibWeb/Crash/CSS/calculated-number-border-image-width.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<!doctype html>
<style>
#foo {
border-image-width: calc(42);
}
</style>
<div id="foo"></div>
Comment thread
coderabbitai[bot] marked this conversation as resolved.
9 changes: 9 additions & 0 deletions Tests/LibWeb/Crash/CSS/calculated-number-stroke-dashoffset.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<!doctype html>
<style>
#foo {
stroke-dashoffset: calc(1);
}
</style>
<svg id="foo">
<path d=""></path>
</svg>
9 changes: 9 additions & 0 deletions Tests/LibWeb/Crash/CSS/calculated-number-stroke-width.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<!doctype html>
<style>
#foo {
stroke-width: calc(1);
}
</style>
<svg id="foo">
<path d=""></path>
</svg>