LibWeb/CSS: Properly classify calculations inside transform functions

Assuming all calculations produce `<length-percentage>` is a very bad assumption, and was causing crashes on https://ai.cloudflare.com/
skyz1 · Jan 15, 2025 · 18e0ff6 · 18e0ff6
1 parent 6fc62c1
commit 18e0ff6
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/Libraries/LibWeb/CSS/Interpolation.cpp b/Libraries/LibWeb/CSS/Interpolation.cpp
@@ -117,17 +117,28 @@ RefPtr<CSSStyleValue const> interpolate_transform(DOM::Element& element, CSSStyl
 {
     // Note that the spec uses column-major notation, so all the matrix indexing is reversed.
 
-    static constexpr auto make_transformation = [](TransformationStyleValue const& transformation) -> AK::Optional<Transformation> {
-        AK::Vector<TransformValue> values;
+    static constexpr auto make_transformation = [](TransformationStyleValue const& transformation) -> Optional<Transformation> {
+        Vector<TransformValue> values;
 
         for (auto const& value : transformation.values()) {
             switch (value->type()) {
             case CSSStyleValue::Type::Angle:
                 values.append(AngleOrCalculated { value->as_angle().angle() });
                 break;
-            case CSSStyleValue::Type::Calculated:
-                values.append(LengthPercentage { value->as_calculated() });
+            case CSSStyleValue::Type::Calculated: {
+                auto& calculated = value->as_calculated();
+                if (calculated.resolves_to_angle()) {
+                    values.append(AngleOrCalculated { calculated });
+                } else if (calculated.resolves_to_length_percentage()) {
+                    values.append(LengthPercentage { calculated });
+                } else if (calculated.resolves_to_number()) {
+                    values.append(NumberPercentage { calculated });
+                } else {
+                    dbgln("Calculation `{}` inside {} transform-function is not a recognized type", calculated.to_string(CSSStyleValue::SerializationMode::Normal), to_string(transformation.transform_function()));
+                    return {};
+                }
                 break;
+            }
             case CSSStyleValue::Type::Length:
                 values.append(LengthPercentage { value->as_length().length() });
                 break;