From f31edc5d6a0001fc1362d9e6f28156ff0b59e276 Mon Sep 17 00:00:00 2001
From: Oriol Brufau <obrufau@igalia.com>
Date: Tue, 19 Aug 2025 05:09:36 -0700
Subject: [PATCH] layout: Stop making `<video>` fall back to a preferred aspect
 ratio of 2 (#38705)

This is simpler, and has been successfully shipped in Blink.
See https://github.com/w3c/csswg-drafts/issues/12053 for more
information.

Testing: Improves WPT tests.

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
---
 components/layout/replaced.rs                  | 18 ++++--------------
 .../intrinsic-size-fallback-video.html.ini     |  9 ---------
 .../video-aspect-ratio.html.ini                |  3 ---
 .../video-intrinsic-width-height.html.ini      |  6 ------
 .../the-video-element/intrinsic_sizes.htm.ini  |  6 ------
 5 files changed, 4 insertions(+), 38 deletions(-)
 delete mode 100644 tests/wpt/meta/css/css-sizing/intrinsic-size-fallback-video.html.ini
 delete mode 100644 tests/wpt/meta/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/video-aspect-ratio.html.ini
 delete mode 100644 tests/wpt/meta/html/semantics/embedded-content/the-video-element/intrinsic_sizes.htm.ini

diff --git a/components/layout/replaced.rs b/components/layout/replaced.rs
index 727829514b1..468b3d96c50 100644
--- a/components/layout/replaced.rs
+++ b/components/layout/replaced.rs
@@ -474,20 +474,10 @@ impl ReplacedContents {
         style: &ComputedValues,
         padding_border_sums: &LogicalVec2<Au>,
     ) -> Option<AspectRatio> {
-        style
-            .preferred_aspect_ratio(
-                self.inline_size_over_block_size_intrinsic_ratio(style),
-                padding_border_sums,
-            )
-            .or_else(|| {
-                matches!(self.kind, ReplacedContentKind::Video(_)).then(Self::default_aspect_ratio)
-            })
-    }
-
-    /// The aspect ratio of the default object sizes.
-    /// <https://drafts.csswg.org/css-images-3/#default-object-size>
-    pub(crate) fn default_aspect_ratio() -> AspectRatio {
-        AspectRatio::from_content_ratio(2.0)
+        style.preferred_aspect_ratio(
+            self.inline_size_over_block_size_intrinsic_ratio(style),
+            padding_border_sums,
+        )
     }
 
     /// The inline size that would result from combining the natural size
diff --git a/tests/wpt/meta/css/css-sizing/intrinsic-size-fallback-video.html.ini b/tests/wpt/meta/css/css-sizing/intrinsic-size-fallback-video.html.ini
deleted file mode 100644
index 916a578655e..00000000000
--- a/tests/wpt/meta/css/css-sizing/intrinsic-size-fallback-video.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[intrinsic-size-fallback-video.html]
-  [.wrapper 2]
-    expected: FAIL
-
-  [.wrapper 3]
-    expected: FAIL
-
-  [.wrapper 4]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/video-aspect-ratio.html.ini b/tests/wpt/meta/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/video-aspect-ratio.html.ini
deleted file mode 100644
index 970e1c88d55..00000000000
--- a/tests/wpt/meta/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/video-aspect-ratio.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[video-aspect-ratio.html]
-  [Aspect ratio for regular video with aspect-ratio:auto]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/video-intrinsic-width-height.html.ini b/tests/wpt/meta/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/video-intrinsic-width-height.html.ini
index 188840470be..c1c7546e744 100644
--- a/tests/wpt/meta/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/video-intrinsic-width-height.html.ini
+++ b/tests/wpt/meta/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/video-intrinsic-width-height.html.ini
@@ -1,9 +1,3 @@
 [video-intrinsic-width-height.html]
-  [only width attribute]
-    expected: FAIL
-
-  [only height attribute]
-    expected: FAIL
-
   [both width/height attributes and style keeping aspect-ratio]
     expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/embedded-content/the-video-element/intrinsic_sizes.htm.ini b/tests/wpt/meta/html/semantics/embedded-content/the-video-element/intrinsic_sizes.htm.ini
deleted file mode 100644
index 3f671372e64..00000000000
--- a/tests/wpt/meta/html/semantics/embedded-content/the-video-element/intrinsic_sizes.htm.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[intrinsic_sizes.htm]
-  [default height is still 150]
-    expected: FAIL
-
-  [default width is still 300]
-    expected: FAIL