From 3a64fa200636dd13a2947be0665398aadc4dff40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Wed, 10 Feb 2021 15:30:40 +0000
Subject: [PATCH] style: Normalize NaN in some other font-related lengths etc.

Depends on D104563

Differential Revision: https://phabricator.services.mozilla.com/D104565
---
 components/style/values/specified/font.rs   | 2 +-
 components/style/values/specified/length.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/style/values/specified/font.rs b/components/style/values/specified/font.rs
index 175b0681750..93b00b27751 100644
--- a/components/style/values/specified/font.rs
+++ b/components/style/values/specified/font.rs
@@ -933,7 +933,7 @@ impl FontSize {
                 // If the parent font was keyword-derived, this is too.
                 // Tack the % onto the factor
                 info = compose_keyword(pc.0);
-                base_size.resolve(context) * pc.0
+                (base_size.resolve(context) * pc.0).normalized()
             },
             FontSize::Length(LengthPercentage::Calc(ref calc)) => {
                 let calc = calc.to_computed_value_zoomed(context, base_size);
diff --git a/components/style/values/specified/length.rs b/components/style/values/specified/length.rs
index 4fc841aea93..2eafa9fbd60 100644
--- a/components/style/values/specified/length.rs
+++ b/components/style/values/specified/length.rs
@@ -135,7 +135,7 @@ impl FontRelativeLength {
         base_size: FontBaseSize,
     ) -> computed::Length {
         let (reference_size, length) = self.reference_font_size_and_length(context, base_size);
-        reference_size * length
+        (reference_size * length).normalized()
     }
 
     /// Return reference font size.