LibWeb/CSS: Replace resolve_number_deprecated() with resolve_number()

Author: https://github.com/AtkinsSJ
Commit: 0dba531772
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/6290
Reviewed-by: https://github.com/tcl3 ✅

Libraries/LibWeb/CSS/CalculatedOr.cpp

@@ -96,7 +96,7 @@ LengthOrCalculated LengthOrAutoOrCalculated::without_auto() const
 
 Optional<double> NumberOrCalculated::resolve_calculated(NonnullRefPtr<CalculatedStyleValue const> const& calculated, CalculationResolutionContext const& context) const
 {
-    return calculated->resolve_number_deprecated(context);
+    return calculated->resolve_number(context);
 }
 
 NonnullRefPtr<StyleValue const> NumberOrCalculated::create_style_value() const

Libraries/LibWeb/CSS/ComputedProperties.cpp

@@ -411,7 +411,7 @@ Optional<int> ComputedProperties::z_index() const
     }
 
     if (value.is_calculated()) {
-        auto maybe_double = value.as_calculated().resolve_number_deprecated({});
+        auto maybe_double = value.as_calculated().resolve_number({});
         if (maybe_double.has_value()) {
             if (*maybe_double >= NumericLimits<int>::max())
                 return NumericLimits<int>::max();

Libraries/LibWeb/CSS/ParsedFontFace.cpp

@@ -190,7 +190,7 @@ ParsedFontFace ParsedFontFace::from_descriptors(CSSFontFaceDescriptors const& de
                 if (setting_value->is_number()) {
                     settings.set(variation_tag->as_open_type_tagged().tag(), setting_value->as_number().number());
                 } else if (setting_value->is_calculated() && setting_value->as_calculated().resolves_to_number()) {
-                    if (auto number = setting_value->as_calculated().resolve_number_deprecated({}); number.has_value()) {
+                    if (auto number = setting_value->as_calculated().resolve_number({}); number.has_value()) {
                         settings.set(variation_tag->as_open_type_tagged().tag(), *number);
                     }
                 }

Libraries/LibWeb/CSS/Parser/ValueParsing.cpp

@@ -368,7 +368,7 @@ Optional<Ratio> Parser::parse_ratio(TokenStream<ComponentValue>& tokens)
                 return maybe_calc->as_number().number();
             if (!maybe_calc->is_calculated() || !maybe_calc->as_calculated().resolves_to_number())
                 return {};
-            if (auto resolved_number = maybe_calc->as_calculated().resolve_number_deprecated({}); resolved_number.has_value() && resolved_number.value() >= 0) {
+            if (auto resolved_number = maybe_calc->as_calculated().resolve_number({}); resolved_number.has_value() && resolved_number.value() >= 0) {
                 return resolved_number.value();
             }
         }

Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.cpp

@@ -3067,21 +3067,6 @@ Optional<Time> CalculatedStyleValue::resolve_time(CalculationResolutionContext c
     return {};
 }
 
-Optional<double> CalculatedStyleValue::resolve_number_deprecated(CalculationResolutionContext const& context) const
-{
-    auto result = m_calculation->resolve(context);
-    if (!result.type().has_value() || !result.type()->matches_number(m_context.percentages_resolve_as))
-        return {};
-
-    // https://drafts.csswg.org/css-values/#calc-ieee
-    // NaN does not escape a top-level calculation; it’s censored into a zero value.
-    auto value = result.value();
-    if (isnan(value))
-        return 0.;
-
-    return value;
-}
-
 Optional<double> CalculatedStyleValue::resolve_number(CalculationResolutionContext const& context) const
 {
     auto result = resolve_value(context);

Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.h

@@ -103,7 +103,6 @@ public:
     Optional<Time> resolve_time(CalculationResolutionContext const&) const;
 
     bool resolves_to_number() const { return m_resolved_type.matches_number(m_context.percentages_resolve_as); }
-    Optional<double> resolve_number_deprecated(CalculationResolutionContext const&) const;
     Optional<double> resolve_number(CalculationResolutionContext const&) const;
     Optional<i64> resolve_integer(CalculationResolutionContext const&) const;
 

Libraries/LibWeb/CSS/StyleValues/FilterValueListStyleValue.cpp

@@ -34,7 +34,7 @@ float FilterOperation::Color::resolved_amount() const
     if (amount.is_calculated()) {
         CalculationResolutionContext context {};
         if (amount.calculated()->resolves_to_number())
-            return amount.calculated()->resolve_number_deprecated(context).value();
+            return amount.calculated()->resolve_number(context).value();
 
         if (amount.calculated()->resolves_to_percentage())
             return amount.calculated()->resolve_percentage_deprecated(context)->as_fraction();

Libraries/LibWeb/CSS/StyleValues/TransformationStyleValue.cpp

@@ -80,7 +80,7 @@ String TransformationStyleValue::to_string(SerializationMode mode) const
             if (value->is_number())
                 return value->as_number().number();
             if (value->is_calculated() && value->as_calculated().resolves_to_number())
-                return value->as_calculated().resolve_number_deprecated({});
+                return value->as_calculated().resolve_number({});
 
             VERIFY_NOT_REACHED();
         };