[Masonry] Nested subgrid track rebuild for auto-placed subgrids [chromium/src : main]

0 views
Skip to first unread message

Ian Kilpatrick (Gerrit)

unread,
Jun 17, 2026, 3:56:46 PM (11 days ago) Jun 17
to Alison Maher, Chromium LUCI CQ, chromium...@chromium.org, Javier Fernandez, blink-revi...@chromium.org, blink-revie...@chromium.org, blink-...@chromium.org, zol...@webkit.org
Attention needed from Alison Maher

Ian Kilpatrick voted and added 1 comment

Votes added by Ian Kilpatrick

Code-Review+1

1 comment

File third_party/blink/renderer/core/layout/grid_lanes/grid_lanes_layout_algorithm.cc
Line 312, Patchset 2 (Latest): }
Ian Kilpatrick . resolved

I mildly prefer a lambda for this type of thing, e.g.
```
auto blah = [&](direction) {

};
blah(kForColumns);
blah(kForRows);
```
but up to you.

Open in Gerrit

Related details

Attention is currently required from:
  • Alison Maher
Submit Requirements:
  • requirement satisfiedCode-Coverage
  • requirement satisfiedCode-Owners
  • requirement satisfiedCode-Review
  • requirement satisfiedReview-Enforcement
Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. DiffyGerrit
Gerrit-MessageType: comment
Gerrit-Project: chromium/src
Gerrit-Branch: main
Gerrit-Change-Id: I687bec9063790e9382d9f3038c5a3c40d83a2a9c
Gerrit-Change-Number: 7953101
Gerrit-PatchSet: 2
Gerrit-Owner: Alison Maher <alm...@microsoft.com>
Gerrit-Reviewer: Alison Maher <alm...@microsoft.com>
Gerrit-Reviewer: Ian Kilpatrick <ikilp...@chromium.org>
Gerrit-CC: Javier Fernandez <jfern...@igalia.com>
Gerrit-Attention: Alison Maher <alm...@microsoft.com>
Gerrit-Comment-Date: Wed, 17 Jun 2026 19:56:33 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
satisfied_requirement
open
diffy

Blink W3C Test Autoroller (Gerrit)

unread,
Jun 17, 2026, 4:14:08 PM (11 days ago) Jun 17
to Alison Maher, Ian Kilpatrick, Chromium LUCI CQ, chromium...@chromium.org, Javier Fernandez, blink-revi...@chromium.org, blink-revie...@chromium.org, blink-...@chromium.org, zol...@webkit.org
Attention needed from Alison Maher

Message from Blink W3C Test Autoroller

Exportable changes to web-platform-tests were detected in this CL and a pull request in the upstream repo has been made: https://github.com/web-platform-tests/wpt/pull/60705.

When this CL lands, the bot will automatically merge the PR on GitHub if the required GitHub checks pass; otherwise, ecosystem-infra@ team will triage the failures and may contact you.

WPT Export docs:
https://chromium.googlesource.com/chromium/src/+/main/docs/testing/web_platform_tests.md#Automatic-export-process

Open in Gerrit

Related details

Attention is currently required from:
  • Alison Maher
Submit Requirements:
  • requirement satisfiedCode-Coverage
  • requirement satisfiedCode-Owners
  • requirement satisfiedCode-Review
  • requirement satisfiedReview-Enforcement
Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. DiffyGerrit
Gerrit-MessageType: comment
Gerrit-Project: chromium/src
Gerrit-Branch: main
Gerrit-Change-Id: I687bec9063790e9382d9f3038c5a3c40d83a2a9c
Gerrit-Change-Number: 7953101
Gerrit-PatchSet: 2
Gerrit-Owner: Alison Maher <alm...@microsoft.com>
Gerrit-Reviewer: Alison Maher <alm...@microsoft.com>
Gerrit-Reviewer: Ian Kilpatrick <ikilp...@chromium.org>
Gerrit-CC: Blink W3C Test Autoroller <blink-w3c-te...@chromium.org>
Gerrit-CC: Javier Fernandez <jfern...@igalia.com>
Gerrit-Attention: Alison Maher <alm...@microsoft.com>
Gerrit-Comment-Date: Wed, 17 Jun 2026 20:14:01 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
satisfied_requirement
open
diffy

Alison Maher (Gerrit)

unread,
Jun 17, 2026, 7:07:52 PM (11 days ago) Jun 17
to Blink W3C Test Autoroller, Ian Kilpatrick, Chromium LUCI CQ, chromium...@chromium.org, Javier Fernandez, blink-revi...@chromium.org, blink-revie...@chromium.org, blink-...@chromium.org, zol...@webkit.org

Alison Maher voted and added 1 comment

Votes added by Alison Maher

Commit-Queue+2

1 comment

File third_party/blink/renderer/core/layout/grid_lanes/grid_lanes_layout_algorithm.cc
Ian Kilpatrick . resolved

I mildly prefer a lambda for this type of thing, e.g.
```
auto blah = [&](direction) {

};
blah(kForColumns);
blah(kForRows);
```
but up to you.

Alison Maher

Yeah that's a bit more explicit. Updated!

Open in Gerrit

Related details

Attention set is empty
Submit Requirements:
  • requirement satisfiedCode-Coverage
  • requirement satisfiedCode-Owners
  • requirement satisfiedCode-Review
  • requirement satisfiedReview-Enforcement
Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. DiffyGerrit
Gerrit-MessageType: comment
Gerrit-Project: chromium/src
Gerrit-Branch: main
Gerrit-Change-Id: I687bec9063790e9382d9f3038c5a3c40d83a2a9c
Gerrit-Change-Number: 7953101
Gerrit-PatchSet: 3
Gerrit-Owner: Alison Maher <alm...@microsoft.com>
Gerrit-Reviewer: Alison Maher <alm...@microsoft.com>
Gerrit-Reviewer: Ian Kilpatrick <ikilp...@chromium.org>
Gerrit-CC: Blink W3C Test Autoroller <blink-w3c-te...@chromium.org>
Gerrit-CC: Javier Fernandez <jfern...@igalia.com>
Gerrit-Comment-Date: Wed, 17 Jun 2026 23:06:57 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: Ian Kilpatrick <ikilp...@chromium.org>
satisfied_requirement
open
diffy

Chromium LUCI CQ (Gerrit)

unread,
Jun 17, 2026, 8:27:15 PM (10 days ago) Jun 17
to Alison Maher, Blink W3C Test Autoroller, Ian Kilpatrick, chromium...@chromium.org, Javier Fernandez, blink-revi...@chromium.org, blink-revie...@chromium.org, blink-...@chromium.org, zol...@webkit.org

Chromium LUCI CQ submitted the change with unreviewed changes

Unreviewed changes

2 is the latest approved patch-set.
The change was submitted with unreviewed changes in the following files:

```
The name of the file: third_party/blink/renderer/core/layout/grid_lanes/grid_lanes_layout_algorithm.cc
Insertions: 12, Deletions: 9.

@@ -301,15 +301,18 @@
GridLayoutData& layout_data = sizing_subtree.LayoutData();

// Rebuild inherited track collections for each subgridded axis.
- for (const auto direction : {kForColumns, kForRows}) {
- if (!layout_data.HasSubgriddedAxis(direction)) {
- continue;
- }
- layout_data.SetTrackCollection(CreateSubgridTrackCollection(
- subgridded_item_data, item.node.Style(), algorithm.GetConstraintSpace(),
- algorithm.BorderScrollbarPadding(), algorithm.GetGridAvailableSize(),
- direction));
- }
+ auto UpdateSubgridTrackCollectionForDirection =
+ [&](GridTrackSizingDirection direction) {
+ if (!layout_data.HasSubgriddedAxis(direction)) {
+ return;
+ }
+ layout_data.SetTrackCollection(CreateSubgridTrackCollection(
+ subgridded_item_data, item.node.Style(),
+ algorithm.GetConstraintSpace(), algorithm.BorderScrollbarPadding(),
+ algorithm.GetGridAvailableSize(), direction));
+ };
+ UpdateSubgridTrackCollectionForDirection(kForColumns);
+ UpdateSubgridTrackCollectionForDirection(kForRows);

// The subgrid's min/max sizes were cached during initial sizing against
// stale inherited tracks. Invalidate the cache so the standalone axis
```

Change information

Commit message:
[Masonry] Nested subgrid track rebuild for auto-placed subgrids

This is a follow up to CL:7946360.

`RebuildSubgridLayoutDataForResolvedPlacement` only updated the
immediate auto-placed subgrid's track collection after placement
resolved. Nested subgrids deeper in the subtree retained stale
collections built against placeholder tracks.

Add `RebuildNestedSubgridLayoutData` which recursively rebuilds
inherited track collections for each layer of nested subgrid, and
invalidates each subgrid's cached min/max sizes so the standalone axis
re-sizing sees the updated tracks.
Bug: 343257585
Change-Id: I687bec9063790e9382d9f3038c5a3c40d83a2a9c
Reviewed-by: Ian Kilpatrick <ikilp...@chromium.org>
Commit-Queue: Alison Maher <alm...@microsoft.com>
Cr-Commit-Position: refs/heads/main@{#1648709}
Files:
  • M third_party/blink/renderer/core/layout/grid_lanes/grid_lanes_layout_algorithm.cc
  • A third_party/blink/web_tests/external/wpt/css/css-grid/grid-lanes/subgrid/grid-subgridded-to-grid-lanes/track-sizing/column-auto-placed-subgrid-nested-subgrid-inherited-tracks-001.html
  • A third_party/blink/web_tests/external/wpt/css/css-grid/grid-lanes/subgrid/grid-subgridded-to-grid-lanes/track-sizing/column-auto-placed-subgrid-nested-subgrid-inherited-tracks-002.html
  • A third_party/blink/web_tests/external/wpt/css/css-grid/grid-lanes/subgrid/grid-subgridded-to-grid-lanes/track-sizing/column-auto-placed-subgrid-nested-subgrid-inherited-tracks-003.html
  • A third_party/blink/web_tests/external/wpt/css/css-grid/grid-lanes/subgrid/grid-subgridded-to-grid-lanes/track-sizing/row-auto-placed-subgrid-nested-subgrid-inherited-tracks-001.html
  • A third_party/blink/web_tests/external/wpt/css/css-grid/grid-lanes/subgrid/grid-subgridded-to-grid-lanes/track-sizing/row-auto-placed-subgrid-nested-subgrid-inherited-tracks-002.html
  • A third_party/blink/web_tests/external/wpt/css/css-grid/grid-lanes/subgrid/grid-subgridded-to-grid-lanes/track-sizing/row-auto-placed-subgrid-nested-subgrid-inherited-tracks-003.html
Change size: L
Delta: 7 files changed, 421 insertions(+), 12 deletions(-)
Branch: refs/heads/main
Submit Requirements:
  • requirement satisfiedCode-Review: +1 by Ian Kilpatrick
Open in Gerrit
Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. DiffyGerrit
Gerrit-MessageType: merged
Gerrit-Project: chromium/src
Gerrit-Branch: main
Gerrit-Change-Id: I687bec9063790e9382d9f3038c5a3c40d83a2a9c
Gerrit-Change-Number: 7953101
Gerrit-PatchSet: 4
Gerrit-Owner: Alison Maher <alm...@microsoft.com>
Gerrit-Reviewer: Alison Maher <alm...@microsoft.com>
Gerrit-Reviewer: Chromium LUCI CQ <chromiu...@luci-project-accounts.iam.gserviceaccount.com>
Gerrit-Reviewer: Ian Kilpatrick <ikilp...@chromium.org>
Gerrit-CC: Blink W3C Test Autoroller <blink-w3c-te...@chromium.org>
open
diffy
satisfied_requirement

Blink W3C Test Autoroller (Gerrit)

unread,
Jun 18, 2026, 2:20:31 AM (10 days ago) Jun 18
to Chromium LUCI CQ, Alison Maher, Ian Kilpatrick, chromium...@chromium.org, Javier Fernandez, blink-revi...@chromium.org, blink-revie...@chromium.org, blink-...@chromium.org, zol...@webkit.org

Message from Blink W3C Test Autoroller

The WPT PR for this CL has been merged upstream! https://github.com/web-platform-tests/wpt/pull/60705

Open in Gerrit

Related details

Attention set is empty
Submit Requirements:
  • requirement satisfiedCode-Coverage
  • requirement satisfiedCode-Owners
  • requirement satisfiedCode-Review
  • requirement satisfiedReview-Enforcement
Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. DiffyGerrit
Gerrit-MessageType: comment
Gerrit-Project: chromium/src
Gerrit-Branch: main
Gerrit-Change-Id: I687bec9063790e9382d9f3038c5a3c40d83a2a9c
Gerrit-Change-Number: 7953101
Gerrit-PatchSet: 4
Gerrit-Owner: Alison Maher <alm...@microsoft.com>
Gerrit-Reviewer: Alison Maher <alm...@microsoft.com>
Gerrit-Reviewer: Chromium LUCI CQ <chromiu...@luci-project-accounts.iam.gserviceaccount.com>
Gerrit-Reviewer: Ian Kilpatrick <ikilp...@chromium.org>
Gerrit-CC: Blink W3C Test Autoroller <blink-w3c-te...@chromium.org>
Gerrit-CC: Javier Fernandez <jfern...@igalia.com>
Gerrit-Comment-Date: Thu, 18 Jun 2026 06:20:17 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
satisfied_requirement
open
diffy
Reply all
Reply to author
Forward
0 new messages