mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-07 00:29:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWeb: Don't crash when interpolating non <number> scale values

Browse source
This commit is contained in:
Tim Ledbetter 2025-04-28 10:02:57 +01:00 • committed by Andreas Kling
commit f854f644a7
Notes: github-actions[bot] 2025-04-28 10:07:35 +00:00
2 changed files with 20 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Libraries/LibWeb/CSS/Interpolation.cpp
View file

@ -58,7 +58,7 @@ static NonnullRefPtr<CSSStyleValue const> with_keyword_values_resolved(DOM::Elem
return value; return value;
} }
static RefPtr<CSSStyleValue const> interpolate_scale(DOM::Element&, CSSStyleValue const& a_from, CSSStyleValue const& a_to, float delta) static RefPtr<CSSStyleValue const> interpolate_scale(DOM::Element& element, CalculationContext calculation_context, CSSStyleValue const& a_from, CSSStyleValue const& a_to, float delta)
{ {
if (a_from.to_keyword() == Keyword::None && a_to.to_keyword() == Keyword::None) if (a_from.to_keyword() == Keyword::None && a_to.to_keyword() == Keyword::None)
return a_from; return a_from;
@ -71,30 +71,21 @@ static RefPtr<CSSStyleValue const> interpolate_scale(DOM::Element&, CSSStyleValu
auto const& from_transform = from.as_transformation(); auto const& from_transform = from.as_transformation();
auto const& to_transform = to.as_transformation(); auto const& to_transform = to.as_transformation();
auto from_x = from_transform.values()[0]->as_number().value(); auto interpolated_x = interpolate_value(element, calculation_context, from_transform.values()[0], to_transform.values()[0], delta);
auto to_x = to_transform.values()[0]->as_number().value(); auto interpolated_y = interpolate_value(element, calculation_context, from_transform.values()[1], to_transform.values()[1], delta);
auto from_y = from_transform.values()[1]->as_number().value();
auto to_y = to_transform.values()[1]->as_number().value();
Optional<double> from_z; RefPtr<CSSStyleValue const> interpolated_z;
Optional<double> to_z;
if (from_transform.values().size() == 3) { if (from_transform.values().size() == 3 || to_transform.values().size() == 3) {
from_z = from_transform.values()[2]->as_number().value(); static auto one_value = NumberStyleValue::create(1);
} auto from = from_transform.values().size() == 3 ? from_transform.values()[2] : one_value;
if (to_transform.values().size() == 3) { auto to = to_transform.values().size() == 3 ? to_transform.values()[2] : one_value;
to_z = to_transform.values()[2]->as_number().value(); interpolated_z = interpolate_value(element, calculation_context, from, to, delta);
}
Optional<double> new_z;
if (from_z.has_value() || to_z.has_value()) {
new_z = interpolate_raw(from_z.value_or(1), to_z.value_or(1), delta);
} }
auto new_x = NumberStyleValue::create(interpolate_raw(from_x, to_x, delta)); StyleValueVector new_values = { interpolated_x, interpolated_y };
auto new_y = NumberStyleValue::create(interpolate_raw(from_y, to_y, delta)); if (interpolated_z && interpolated_z->is_number() && interpolated_z->as_number().number() != 1) {
new_values.append(*interpolated_z);
StyleValueVector new_values = { new_x, new_y };
if (new_z.has_value() && new_z.value() != 1) {
new_values.append(NumberStyleValue::create(new_z.value()));
} }
return TransformationStyleValue::create( return TransformationStyleValue::create(
@ -135,7 +126,7 @@ ValueComparingRefPtr<CSSStyleValue const> interpolate_property(DOM::Element& ele
return interpolate_box_shadow(element, calculation_context, from, to, delta); return interpolate_box_shadow(element, calculation_context, from, to, delta);
if (property_id == PropertyID::Scale) if (property_id == PropertyID::Scale)
return interpolate_scale(element, from, to, delta); return interpolate_scale(element, calculation_context, from, to, delta);
// FIXME: Handle all custom animatable properties // FIXME: Handle all custom animatable properties
[[fallthrough]]; [[fallthrough]];

6
Tests/LibWeb/Crash/wpt-import/css/css-values/animations/scale-interpolation-crash.html Normal file
View file

@ -0,0 +1,6 @@
<!DOCTYPE html>
<link rel="help" href="https://issues.chromium.org/issues/396584141">
<style>
body { animation: foo 1s; }
@keyframes foo { to { scale: calc(100% * 1); } }
</style>