Changeset 290572 in webkit

Timestamp:

Feb 27, 2022 2:19:14 PM (5 months ago)

Author:

Matt Woodrow

Message:

Handle reverse flow direction when converting iterator coords for a subgrid
​https://bugs.webkit.org/show_bug.cgi?id=236955

Reviewed by Dean Jackson.

Source/WebCore:

When recursing into a subgrid via createForSubgrid, we convert the iterator's
position into coordinates relative to the subgrid. This handles the case where
the subgrid has a reverse flow direction (RTL vs LTR) and swaps the position
to be relative to the opposite edge.

Marks existing WPT grid-gap-007.html as passing

• rendering/Grid.cpp:

(WebCore::GridIterator::createForSubgrid):

LayoutTests:

• TestExpectations:

Marked grid-gap-007.html as now passing, and added bug annotations to
remaining subgrid failures.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/Grid.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-02-27  Matt Woodrow  <mattwoodrow@apple.com>
+
+        Handle reverse flow direction when converting iterator coords for a subgrid
+        https://bugs.webkit.org/show_bug.cgi?id=236955
+
+        Reviewed by Dean Jackson.
+
+        * TestExpectations:
+
+        Marked grid-gap-007.html as now passing, and added bug annotations to
+        remaining subgrid failures.
+
 2022-02-27  Philippe Normand  <pnormand@igalia.com>
 

trunk/LayoutTests/TestExpectations

@@ -1395 +1395 @@
 imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/masonry-subgrid-002.html [ ImageOnlyFailure ]
 
-imported/w3c/web-platform-tests/css/css-grid/subgrid/auto-track-sizing-001.html [ ImageOnlyFailure ]
-imported/w3c/web-platform-tests/css/css-grid/subgrid/baseline-001.html [ ImageOnlyFailure ]
-imported/w3c/web-platform-tests/css/css-grid/subgrid/grid-gap-003.html [ ImageOnlyFailure ]
-imported/w3c/web-platform-tests/css/css-grid/subgrid/grid-gap-007.html [ ImageOnlyFailure ]
-imported/w3c/web-platform-tests/css/css-grid/subgrid/line-names-007.html [ ImageOnlyFailure ]
-imported/w3c/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-002.html [ ImageOnlyFailure ]
-imported/w3c/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-003.html [ ImageOnlyFailure ]
-imported/w3c/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-004.html [ ImageOnlyFailure ]
-imported/w3c/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-003.html [ ImageOnlyFailure ]
-imported/w3c/web-platform-tests/css/css-grid/subgrid/subgrid-mbp-overflow-001.html [ ImageOnlyFailure ]
-imported/w3c/web-platform-tests/css/css-grid/subgrid/subgrid-mbp-overflow-002.html [ ImageOnlyFailure ]
-imported/w3c/web-platform-tests/css/css-grid/subgrid/subgrid-mbp-overflow-003.html [ ImageOnlyFailure ]
-imported/w3c/web-platform-tests/css/css-grid/subgrid/subgrid-mbp-overflow-004.html [ ImageOnlyFailure ]
+webkit.org/b/236951 imported/w3c/web-platform-tests/css/css-grid/subgrid/auto-track-sizing-001.html [ ImageOnlyFailure ]
+webkit.org/b/236959 imported/w3c/web-platform-tests/css/css-grid/subgrid/baseline-001.html [ ImageOnlyFailure ]
+webkit.org/b/236956 imported/w3c/web-platform-tests/css/css-grid/subgrid/grid-gap-003.html [ ImageOnlyFailure ]
+webkit.org/b/236957 imported/w3c/web-platform-tests/css/css-grid/subgrid/line-names-007.html [ ImageOnlyFailure ]
+webkit.org/b/236953 imported/w3c/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-002.html [ ImageOnlyFailure ]
+webkit.org/b/236954 imported/w3c/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-003.html [ ImageOnlyFailure ]
+webkit.org/b/236953 imported/w3c/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-004.html [ ImageOnlyFailure ]
+webkit.org/b/236958 imported/w3c/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-003.html [ ImageOnlyFailure ]
+webkit.org/b/236949 imported/w3c/web-platform-tests/css/css-grid/subgrid/subgrid-mbp-overflow-001.html [ ImageOnlyFailure ]
+webkit.org/b/236949 imported/w3c/web-platform-tests/css/css-grid/subgrid/subgrid-mbp-overflow-002.html [ ImageOnlyFailure ]
+webkit.org/b/236949 imported/w3c/web-platform-tests/css/css-grid/subgrid/subgrid-mbp-overflow-003.html [ ImageOnlyFailure ]
+webkit.org/b/236949 imported/w3c/web-platform-tests/css/css-grid/subgrid/subgrid-mbp-overflow-004.html [ ImageOnlyFailure ]
 
 webkit.org/b/149890 fast/css-grid-layout/grid-shorthands-style-format.html [ Failure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-02-27  Matt Woodrow  <mattwoodrow@apple.com>
+
+        Handle reverse flow direction when converting iterator coords for a subgrid
+        https://bugs.webkit.org/show_bug.cgi?id=236955
+
+        Reviewed by Dean Jackson.
+
+        When recursing into a subgrid via createForSubgrid, we convert the iterator's
+        position into coordinates relative to the subgrid. This handles the case where
+        the subgrid has a reverse flow direction (RTL vs LTR) and swaps the position
+        to be relative to the opposite edge.
+
+        Marks existing WPT grid-gap-007.html as passing
+
+        * rendering/Grid.cpp:
+        (WebCore::GridIterator::createForSubgrid):
+
 2022-02-27  Antoine Quint  <graouts@webkit.org>
 

trunk/Source/WebCore/rendering/Grid.cpp

@@ -281 +281 @@
     ASSERT(subgrid.isSubgrid(innerDirection));
 
+    if (GridLayoutFunctions::isSubgridReversedDirection(*downcast<RenderGrid>(subgrid.parent()), outer.direction(), subgrid)) {
+        unsigned fixedMax = subgrid.currentGrid().numTracks(innerDirection);
+        fixedIndex = fixedMax - fixedIndex - 1;
+    }
+
     return GridIterator(subgrid.currentGrid(), innerDirection, fixedIndex);
 }