Properly handle degenerate aspect ratios (#30245)

When a replaced element has a degenerate aspect ratio, it should be
handled as if that element did not have an aspect ratio according to
https://drafts.csswg.org/css-images/#natural-aspect-ratio.

2 files changed, 35 insertions, 29 deletions

diff --git a/components/layout_2020/display_list/mod.rs b/components/layout_2020/display_list/mod.rs
index 4fce61406d1..74efeec1008 100644
--- a/components/layout_2020/display_list/mod.rs
+++ b/components/layout_2020/display_list/mod.rs
@@ -566,11 +566,7 @@ impl<'a> BuilderForBoxFragment<'a> {
             match image {
                 Image::None => {},
                 Image::Gradient(ref gradient) => {
-                    let intrinsic = IntrinsicSizes {
-                        width: None,
-                        height: None,
-                        ratio: None,
-                    };
+                    let intrinsic = IntrinsicSizes::empty();
                     if let Some(layer) =
                         &background::layout_layer(self, &source, builder, index, intrinsic)
                     {
@@ -607,13 +603,10 @@ impl<'a> BuilderForBoxFragment<'a> {
 
                     // FIXME: https://drafts.csswg.org/css-images-4/#the-image-resolution
                     let dppx = 1.0;
-
-                    let intrinsic = IntrinsicSizes {
-                        width: Some(Length::new(width as f32 / dppx)),
-                        height: Some(Length::new(height as f32 / dppx)),
-                        // FIXME https://github.com/w3c/csswg-drafts/issues/4572
-                        ratio: Some(width as f32 / height as f32),
-                    };
+                    let intrinsic = IntrinsicSizes::from_width_and_height(
+                        width as f32 / dppx,
+                        height as f32 / dppx,
+                    );
 
                     if let Some(layer) =
                         background::layout_layer(self, &source, builder, index, intrinsic)
diff --git a/components/layout_2020/replaced.rs b/components/layout_2020/replaced.rs
index d350086c63a..b1831335002 100644
--- a/components/layout_2020/replaced.rs
+++ b/components/layout_2020/replaced.rs
@@ -54,6 +54,33 @@ pub(crate) struct IntrinsicSizes {
     pub ratio: Option<CSSFloat>,
 }
 
+impl IntrinsicSizes {
+    pub(crate) fn from_width_and_height(width: f32, height: f32) -> Self {
+        // https://drafts.csswg.org/css-images/#natural-aspect-ratio:
+        // "If an object has a degenerate natural aspect ratio (at least one part being
+        // zero or infinity), it is treated as having no natural aspect ratio.""
+        let ratio = if width.is_normal() && height.is_normal() {
+            Some(width / height)
+        } else {
+            None
+        };
+
+        Self {
+            width: Some(Length::new(width)),
+            height: Some(Length::new(height)),
+            ratio,
+        }
+    }
+
+    pub(crate) fn empty() -> Self {
+        Self {
+            width: None,
+            height: None,
+            ratio: None,
+        }
+    }
+}
+
 #[derive(Serialize)]
 pub(crate) enum CanvasSource {
     WebGL(ImageKey),
@@ -121,11 +148,7 @@ impl ReplacedContent {
         };
 
         let intrinsic = intrinsic_size_in_dots.map_or_else(
-            || IntrinsicSizes {
-                width: None,
-                height: None,
-                ratio: None,
-            },
+            || IntrinsicSizes::empty(),
             |intrinsic_size_in_dots| {
                 // FIXME: should 'image-resolution' (when implemented) be used *instead* of
                 // `script::dom::htmlimageelement::ImageRequest::current_pixel_density`?
@@ -133,12 +156,7 @@ impl ReplacedContent {
                 let dppx = 1.0;
                 let width = (intrinsic_size_in_dots.width as CSSFloat) / dppx;
                 let height = (intrinsic_size_in_dots.height as CSSFloat) / dppx;
-                IntrinsicSizes {
-                    width: Some(Length::new(width)),
-                    height: Some(Length::new(height)),
-                    // FIXME https://github.com/w3c/csswg-drafts/issues/4572
-                    ratio: Some(width / height),
-                }
+                IntrinsicSizes::from_width_and_height(width, height)
             },
         );
 
@@ -172,12 +190,7 @@ impl ReplacedContent {
 
             return Some(Self {
                 kind: ReplacedContentKind::Image(image),
-                intrinsic: IntrinsicSizes {
-                    width: Some(Length::new(width)),
-                    height: Some(Length::new(height)),
-                    // FIXME https://github.com/w3c/csswg-drafts/issues/4572
-                    ratio: Some(width / height),
-                },
+                intrinsic: IntrinsicSizes::from_width_and_height(width, height),
                 base_fragment_info: BaseFragmentInfo::new_for_node(element.opaque()),
             });
         }