Title: [290576] trunk
- Revision
- 290576
- Author
- [email protected]
- Date
- 2022-02-27 18:14:28 -0800 (Sun, 27 Feb 2022)
Log 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.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (290575 => 290576)
--- trunk/LayoutTests/ChangeLog 2022-02-28 01:24:54 UTC (rev 290575)
+++ trunk/LayoutTests/ChangeLog 2022-02-28 02:14:28 UTC (rev 290576)
@@ -1,5 +1,16 @@
2022-02-27 Matt Woodrow <[email protected]>
+ 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 <[email protected]>
+
Handle reverse flow direction when converting iterator coords for a subgrid
https://bugs.webkit.org/show_bug.cgi?id=236955
Modified: trunk/LayoutTests/TestExpectations (290575 => 290576)
--- trunk/LayoutTests/TestExpectations 2022-02-28 01:24:54 UTC (rev 290575)
+++ trunk/LayoutTests/TestExpectations 2022-02-28 02:14:28 UTC (rev 290576)
@@ -1399,7 +1399,6 @@
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 ]
Modified: trunk/Source/WebCore/ChangeLog (290575 => 290576)
--- trunk/Source/WebCore/ChangeLog 2022-02-28 01:24:54 UTC (rev 290575)
+++ trunk/Source/WebCore/ChangeLog 2022-02-28 02:14:28 UTC (rev 290576)
@@ -1,3 +1,19 @@
+2022-02-27 Matt Woodrow <[email protected]>
+
+ 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 <[email protected]>
Omit template parameter for SetForScope<> variables
Modified: trunk/Source/WebCore/rendering/GridLayoutFunctions.cpp (290575 => 290576)
--- trunk/Source/WebCore/rendering/GridLayoutFunctions.cpp 2022-02-28 01:24:54 UTC (rev 290575)
+++ trunk/Source/WebCore/rendering/GridLayoutFunctions.cpp 2022-02-28 02:14:28 UTC (rev 290576)
@@ -139,8 +139,10 @@
margin = marginStart + marginEnd;
}
- 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;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
