Changeset 290576 in webkit

Timestamp:

Feb 27, 2022 6:14:28 PM (5 months ago)

Author:

Matt Woodrow

Message:

Convert grid direction to be relative to subgrid when accounting for extra margin.
​https://bugs.webkit.org/show_bug.cgi?id=236954

Reviewed by Dean Jackson.

Source/WebCore:

|direction| is passed as a direction relative to |grid|, so we need to convert it
to be a direction relative to the subgrid item in order to account for margin on
the correct edge.

Marks existing test orthogonal-writing-mode-003.html as passing.

• rendering/GridLayoutFunctions.cpp:

(WebCore::GridLayoutFunctions::marginLogicalSizeForChild):

LayoutTests:

• TestExpectations:

Marks existing test orthogonal-writing-mode-003.html as passing.

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-02-27  Matt Woodrow  <mattwoodrow@apple.com>
+
+        Convert grid direction to be relative to subgrid when accounting for extra margin.
+        https://bugs.webkit.org/show_bug.cgi?id=236954
+
+        Reviewed by Dean Jackson.
+
+        * TestExpectations:
+
+        Marks existing test orthogonal-writing-mode-003.html as passing.
+
 2022-02-27  Matt Woodrow  <mattwoodrow@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -1400 +1400 @@
 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 ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-02-27  Matt Woodrow  <mattwoodrow@apple.com>
+
+        Convert grid direction to be relative to subgrid when accounting for extra margin.
+        https://bugs.webkit.org/show_bug.cgi?id=236954
+
+        Reviewed by Dean Jackson.
+
+        |direction| is passed as a direction relative to |grid|, so we need to convert it
+        to be a direction relative to the subgrid item in order to account for margin on
+        the correct edge.
+
+        Marks existing test orthogonal-writing-mode-003.html as passing.
+
+        * rendering/GridLayoutFunctions.cpp:
+        (WebCore::GridLayoutFunctions::marginLogicalSizeForChild):
+
 2022-02-27  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/rendering/GridLayoutFunctions.cpp

@@ -140 +140 @@
     }
 
-    if (&grid != child.parent())
-        margin += extraMarginForSubgridAncestors(direction, child);
+    if (&grid != child.parent()) {
+        GridTrackSizingDirection subgridDirection = flowAwareDirectionForChild(grid, *downcast<RenderGrid>(child.parent()), direction);
+        margin += extraMarginForSubgridAncestors(subgridDirection, child);
+    }
 
     return margin;