Title: [284235] trunk
Revision
284235
Author
[email protected]
Date
2021-10-14 23:24:33 -0700 (Thu, 14 Oct 2021)

Log Message

Fix grid-auto-repeat-dynamic-003.html
https://bugs.webkit.org/show_bug.cgi?id=231592

Patch by Rob Buis <[email protected]> on 2021-10-14
Reviewed by Alan Bujtas.

Source/WebCore:

Also call dirtyForLayoutFromPercentageHeightDescendants when laying out inline children, since
they may have a percentage height dependency as well as grid-auto-repeat-dynamic-003.html shows.

Test: imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-dynamic-003.html

* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::layoutBlock):
(WebCore::RenderBlockFlow::layoutBlockChildren):

LayoutTests:

* TestExpectations:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (284234 => 284235)


--- trunk/LayoutTests/ChangeLog	2021-10-15 05:04:27 UTC (rev 284234)
+++ trunk/LayoutTests/ChangeLog	2021-10-15 06:24:33 UTC (rev 284235)
@@ -1,3 +1,12 @@
+2021-10-14  Rob Buis  <[email protected]>
+
+        Fix grid-auto-repeat-dynamic-003.html
+        https://bugs.webkit.org/show_bug.cgi?id=231592
+
+        Reviewed by Alan Bujtas.
+
+        * TestExpectations:
+
 2021-10-14  Aditya Keerthi  <[email protected]>
 
         [iOS] Support accent-color for controls without text

Modified: trunk/LayoutTests/TestExpectations (284234 => 284235)


--- trunk/LayoutTests/TestExpectations	2021-10-15 05:04:27 UTC (rev 284234)
+++ trunk/LayoutTests/TestExpectations	2021-10-15 06:24:33 UTC (rev 284235)
@@ -1351,7 +1351,6 @@
 webkit.org/b/216146 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-baseline-justify-001.html [ ImageOnlyFailure ]
 
 imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-dynamic-001.html [ ImageOnlyFailure ]
-imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-dynamic-003.html [ ImageOnlyFailure ]
 imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-repeat-max-width-001.html [ ImageOnlyFailure ]
 
 imported/w3c/web-platform-tests/css/css-grid/grid-items/aspect-ratio-004.html [ ImageOnlyFailure ]

Modified: trunk/Source/WebCore/ChangeLog (284234 => 284235)


--- trunk/Source/WebCore/ChangeLog	2021-10-15 05:04:27 UTC (rev 284234)
+++ trunk/Source/WebCore/ChangeLog	2021-10-15 06:24:33 UTC (rev 284235)
@@ -1,3 +1,19 @@
+2021-10-14  Rob Buis  <[email protected]>
+
+        Fix grid-auto-repeat-dynamic-003.html
+        https://bugs.webkit.org/show_bug.cgi?id=231592
+
+        Reviewed by Alan Bujtas.
+
+        Also call dirtyForLayoutFromPercentageHeightDescendants when laying out inline children, since
+        they may have a percentage height dependency as well as grid-auto-repeat-dynamic-003.html shows.
+
+        Test: imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-dynamic-003.html
+
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::layoutBlock):
+        (WebCore::RenderBlockFlow::layoutBlockChildren):
+
 2021-10-14  Sihui Liu  <[email protected]>
 
         Add UNUSED_PARAM to WebSpeechRecognizerTaskMock.mm

Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (284234 => 284235)


--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp	2021-10-15 05:04:27 UTC (rev 284234)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp	2021-10-15 06:24:33 UTC (rev 284235)
@@ -524,6 +524,7 @@
         }
         if (!firstChild() && !isAnonymousBlock())
             setChildrenInline(true);
+        dirtyForLayoutFromPercentageHeightDescendants();
         if (childrenInline())
             layoutInlineChildren(relayoutChildren, repaintLogicalTop, repaintLogicalBottom);
         else
@@ -630,8 +631,6 @@
 
 void RenderBlockFlow::layoutBlockChildren(bool relayoutChildren, LayoutUnit& maxFloatLogicalBottom)
 {
-    dirtyForLayoutFromPercentageHeightDescendants();
-
     LayoutUnit beforeEdge = borderAndPaddingBefore();
     LayoutUnit afterEdge = borderAndPaddingAfter() + scrollbarLogicalHeight();
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to