Title: [280023] trunk
Revision
280023
Author
[email protected]
Date
2021-07-19 06:55:23 -0700 (Mon, 19 Jul 2021)

Log Message

[css-grid] Use correct block-size to resolve min-content
https://bugs.webkit.org/show_bug.cgi?id=227167

Reviewed by Javier Fernandez.

LayoutTests/imported/w3c:

The following test is passing -

* web-platform-tests/css/css-grid/grid-items/grid-item-inline-contribution-001.html:

Source/WebCore:

When the min/max depends on block-size, We need to make sure that min/max widths are set dirty for
replaced element when block-size changes so that the correct block-size is used to get min/max widths.

Test: imported/w3c/web-platform-tests/css/css-grid/grid-items/grid-item-inline-contribution-001.html

* rendering/RenderReplaced.cpp:
(WebCore::RenderReplaced::layout):

Modified Paths

Diff

Modified: trunk/LayoutTests/TestExpectations (280022 => 280023)


--- trunk/LayoutTests/TestExpectations	2021-07-19 08:39:01 UTC (rev 280022)
+++ trunk/LayoutTests/TestExpectations	2021-07-19 13:55:23 UTC (rev 280023)
@@ -1447,7 +1447,6 @@
 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 ]
-imported/w3c/web-platform-tests/css/css-grid/grid-items/grid-item-inline-contribution-001.html [ ImageOnlyFailure ]
 imported/w3c/web-platform-tests/css/css-grid/grid-items/grid-item-inline-contribution-003.html [ ImageOnlyFailure ]
 
 imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-009.html [ ImageOnlyFailure ]

Modified: trunk/LayoutTests/imported/w3c/ChangeLog (280022 => 280023)


--- trunk/LayoutTests/imported/w3c/ChangeLog	2021-07-19 08:39:01 UTC (rev 280022)
+++ trunk/LayoutTests/imported/w3c/ChangeLog	2021-07-19 13:55:23 UTC (rev 280023)
@@ -1,3 +1,14 @@
+2021-07-19  Ziran Sun  <[email protected]>
+
+        [css-grid] Use correct block-size to resolve min-content
+        https://bugs.webkit.org/show_bug.cgi?id=227167
+
+        Reviewed by Javier Fernandez.
+
+        The following test is passing -
+        
+        * web-platform-tests/css/css-grid/grid-items/grid-item-inline-contribution-001.html:
+
 2021-07-15  Chris Dumez  <[email protected]>
 
         Implement 'SubmitEvent' interface

Modified: trunk/LayoutTests/platform/ios-wk2/TestExpectations (280022 => 280023)


--- trunk/LayoutTests/platform/ios-wk2/TestExpectations	2021-07-19 08:39:01 UTC (rev 280022)
+++ trunk/LayoutTests/platform/ios-wk2/TestExpectations	2021-07-19 13:55:23 UTC (rev 280023)
@@ -1864,6 +1864,7 @@
 webkit.org/b/227283 imported/w3c/web-platform-tests/css/css-grid/grid-items/aspect-ratio-001.html [ ImageOnlyFailure ]
 webkit.org/b/227283 imported/w3c/web-platform-tests/css/css-grid/grid-items/aspect-ratio-002.html [ ImageOnlyFailure ]
 webkit.org/b/227283 imported/w3c/web-platform-tests/css/css-grid/grid-items/aspect-ratio-003.html [ ImageOnlyFailure ]
+webkit.org/b/227283 imported/w3c/web-platform-tests/css/css-grid/grid-items/grid-item-inline-contribution-001.html [ ImageOnlyFailure ]
 webkit.org/b/227283 imported/w3c/web-platform-tests/css/css-grid/grid-items/grid-item-inline-contribution-002.html [ ImageOnlyFailure ]
 webkit.org/b/227283 imported/w3c/web-platform-tests/css/css-grid/grid-items/replaced-element-011.html [ ImageOnlyFailure ]
 webkit.org/b/227283 imported/w3c/web-platform-tests/css/css-grid/grid-items/replaced-element-012.html [ ImageOnlyFailure ]

Modified: trunk/Source/WebCore/ChangeLog (280022 => 280023)


--- trunk/Source/WebCore/ChangeLog	2021-07-19 08:39:01 UTC (rev 280022)
+++ trunk/Source/WebCore/ChangeLog	2021-07-19 13:55:23 UTC (rev 280023)
@@ -1,5 +1,20 @@
 2021-07-19  Ziran Sun  <[email protected]>
 
+        [css-grid] Use correct block-size to resolve min-content
+        https://bugs.webkit.org/show_bug.cgi?id=227167
+
+        Reviewed by Javier Fernandez.
+
+        When the min/max depends on block-size, We need to make sure that min/max widths are set dirty for
+        replaced element when block-size changes so that the correct block-size is used to get min/max widths.
+
+        Test: imported/w3c/web-platform-tests/css/css-grid/grid-items/grid-item-inline-contribution-001.html
+
+        * rendering/RenderReplaced.cpp:
+        (WebCore::RenderReplaced::layout):
+
+2021-07-19  Ziran Sun  <[email protected]>
+
         [CSS-grid] Ignore the aspect-ratio of a replaced element if stretch alignments are applied to both axes
         https://bugs.webkit.org/show_bug.cgi?id=227573
 

Modified: trunk/Source/WebCore/rendering/RenderReplaced.cpp (280022 => 280023)


--- trunk/Source/WebCore/rendering/RenderReplaced.cpp	2021-07-19 08:39:01 UTC (rev 280022)
+++ trunk/Source/WebCore/rendering/RenderReplaced.cpp	2021-07-19 13:55:23 UTC (rev 280023)
@@ -102,6 +102,8 @@
     ASSERT(needsLayout());
     
     LayoutRepainter repainter(*this, checkForRepaintDuringLayout());
+
+    LayoutRect oldContentRect = replacedContentRect();
     
     setHeight(minimumReplacedHeight());
 
@@ -115,6 +117,9 @@
 
     repainter.repaintAfterLayout();
     clearNeedsLayout();
+
+    if (replacedContentRect() != oldContentRect)
+        setPreferredLogicalWidthsDirty(true);
 }
 
 void RenderReplaced::intrinsicSizeChanged()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to