Changeset 280023 in webkit

Timestamp:

Jul 19, 2021 6:55:23 AM (12 months ago)

Author:

Ziran Sun

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):

Location:

trunk

Files:

• LayoutTests/TestExpectations (modified) (1 diff)
• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/platform/ios-wk2/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderReplaced.cpp (modified) (2 diffs)

trunk/LayoutTests/TestExpectations

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

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-07-19  Ziran Sun  <zsun@igalia.com>
+
+        [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  <cdumez@apple.com>
 

trunk/LayoutTests/platform/ios-wk2/TestExpectations

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-07-19  Ziran Sun  <zsun@igalia.com>
+
+        [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  <zsun@igalia.com>
 

trunk/Source/WebCore/rendering/RenderReplaced.cpp

@@ -103 +103 @@
     
     LayoutRepainter repainter(*this, checkForRepaintDuringLayout());
+
+    LayoutRect oldContentRect = replacedContentRect();
     
     setHeight(minimumReplacedHeight());
@@ -116 +118 @@
     repainter.repaintAfterLayout();
     clearNeedsLayout();
+
+    if (replacedContentRect() != oldContentRect)
+        setPreferredLogicalWidthsDirty(true);
 }