From 27c40fcd29e76555eba8f7d6c8d2b2e5caed09d3 Mon Sep 17 00:00:00 2001
From: Oriol Brufau <obrufau@igalia.com>
Date: Mon, 3 Feb 2025 18:11:49 +0100
Subject: [PATCH] layout: Don't let table grid boxes inherit `display:
 inline-table` (#35264)

The outer display type of a table element applies to the table wrapper
box. The table grid box needs to be block-level as defined in
https://drafts.csswg.org/css-tables/#table-grid-box

Therefore this sets `display: table` on table grid boxes, and then when
painting collapsed table borders we can use the usual logic to compute
the StackingContextSection.

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
---
 components/layout_2020/display_list/stacking_context.rs | 8 ++++----
 resources/servo.css                                     | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/components/layout_2020/display_list/stacking_context.rs b/components/layout_2020/display_list/stacking_context.rs
index 69a45a48916..0d9704e4b48 100644
--- a/components/layout_2020/display_list/stacking_context.rs
+++ b/components/layout_2020/display_list/stacking_context.rs
@@ -1216,7 +1216,8 @@ impl BoxFragment {
                 });
         };
 
-        add_fragment(self.get_stacking_context_section());
+        let section = self.get_stacking_context_section();
+        add_fragment(section);
         if !self.style.get_outline().outline_width.is_zero() {
             add_fragment(StackingContextSection::Outline);
         }
@@ -1239,7 +1240,7 @@ impl BoxFragment {
                     scroll_node_id: new_scroll_node_id,
                     reference_frame_scroll_node_id: reference_frame_scroll_node_id_for_fragments,
                     clip_chain_id: new_clip_chain_id,
-                    section: self.get_stacking_context_section(),
+                    section,
                     containing_block: containing_block.rect,
                     fragment: fragment.clone(),
                     is_hit_test_for_scrollable_overflow: true,
@@ -1303,8 +1304,7 @@ impl BoxFragment {
                     scroll_node_id: new_scroll_node_id,
                     reference_frame_scroll_node_id: reference_frame_scroll_node_id_for_fragments,
                     clip_chain_id: new_clip_chain_id,
-                    // TODO: should this use `self.get_stacking_context_section()`?
-                    section: StackingContextSection::DescendantBackgroundsAndBorders,
+                    section,
                     containing_block: containing_block.rect,
                     fragment: fragment.clone(),
                     is_hit_test_for_scrollable_overflow: false,
diff --git a/resources/servo.css b/resources/servo.css
index 2704ea7dc69..25d3855af06 100644
--- a/resources/servo.css
+++ b/resources/servo.css
@@ -269,6 +269,9 @@ svg > * {
   contain: unset;
   container: unset;
   scroll-margin: unset;
+
+  /* The grid needs to be block-level, so avoid inheriting `display: inline-table`. */
+  display: table;
 }
 
 *|*::-servo-legacy-anonymous-block {