tor-browser

commit 92cf2b2fec555934fa986c5dd426edd51a460fe4
parent 63fc322b2400dcd3d95d3cd2e801a30984014856
Author: Ting-Yu Lin <tlin@mozilla.com>
Date:   Wed,  1 Oct 2025 17:08:06 +0000

Bug 1981300 - Remove layout.css.grid-flex-spanning-items-intrinsic-sizing.enabled. r=layout-reviewers,emilio

Differential Revision: https://phabricator.services.mozilla.com/D267004

Diffstat:
M
layout/generic/nsGridContainerFrame.cpp
 | 
8
+++-----
M
modules/libpref/init/StaticPrefList.yaml
 | 
7
-------

2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/layout/generic/nsGridContainerFrame.cpp b/layout/generic/nsGridContainerFrame.cpp
@@ -7151,16 +7151,14 @@ void nsGridContainerFrame::Tracks::ResolveIntrinsicSize(
       // Collect information for step 3.
       // https://drafts.csswg.org/css-grid-2/#algo-spanning-items
 
-      nsTArray<SpanningItemData>* items = &nonFlexSpanningItems;
+      nsTArray<SpanningItemData>* items;
       if (state & TrackSize::eFlexMaxSizing) {
         // Set eIsFlexing on the item state here to speed up
         // FindUsedFlexFraction later.
         gridItem.mState[mAxis] |= ItemState::eIsFlexing;
-        if (!StaticPrefs::
-                layout_css_grid_flex_spanning_items_intrinsic_sizing_enabled()) {
-          continue;
-        }
         items = &flexSpanningItems;
+      } else {
+        items = &nonFlexSpanningItems;
       }
 
       if (state &
diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
@@ -10102,13 +10102,6 @@
   mirror: always
   rust: true
 
-# Perform intrinsic sizing of flexible grid tracks based on grid items that
-# span more than one track.
-- name: layout.css.grid-flex-spanning-items-intrinsic-sizing.enabled
-  type: bool
-  value: true
-  mirror: always
-
 # Enable the new multi-pass grid track sizing algorithm.
 # This features implements two aspects from the CSS Grid Level 2 spec:
 # 1. Percent-valued row track size re-resolution: