Changeset 271436 in webkit

Timestamp:

Jan 13, 2021, 3:54:00 AM (6 years ago)

Author:

svillar@igalia.com

Message:

REGRESSION(r268666) Incorrect vertical position inside grid items with padding
​https://bugs.webkit.org/show_bug.cgi?id=220524

Reviewed by Manuel Rego Casasnovas.

Source/WebCore:

In r268666 we sanitized and renamed the old overrideLogicalXXX sizes so that they store what they say.
There was a mistake in one of those renames, in availableLogicalHeightForPercentageComputation() we were
returning the border box size for the case of grid items. That's clearly wrong as we should return the
content box size. That's why adding a padding to a grid item was causing their children to wrongly
evaluate the available logical height.

This fixes a WPT that was marked as failure.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::availableLogicalHeightForPercentageComputation const): Return the
overridingContentLogicalHeight instead of the overridingLogicalHeight.

LayoutTests:

• TestExpectations: remove web-platform-tests/css/css-grid/grid-items/percentage-size-subitems-001.html

from the list of image failures.

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-01-13  Sergio Villar Senin  <svillar@igalia.com>
+
+        REGRESSION(r268666) Incorrect vertical position inside grid items with padding
+        https://bugs.webkit.org/show_bug.cgi?id=220524
+
+        Reviewed by Manuel Rego Casasnovas.
+
+        * TestExpectations: remove web-platform-tests/css/css-grid/grid-items/percentage-size-subitems-001.html
+        from the list of image failures.
+
 2021-01-12  Antoine Quint  <graouts@webkit.org>
 

trunk/LayoutTests/TestExpectations

@@ -1207 +1207 @@
 webkit.org/b/216145 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-9.html [ ImageOnlyFailure ]
 webkit.org/b/216145 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-10.html [ ImageOnlyFailure ]
-webkit.org/b/191461 imported/w3c/web-platform-tests/css/css-grid/grid-items/percentage-size-subitems-001.html [ ImageOnlyFailure ]
 webkit.org/b/191463 imported/w3c/web-platform-tests/css/css-grid/grid-items/explicitly-sized-grid-item-as-table.html [ ImageOnlyFailure ]
 webkit.org/b/191627 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-001.html [ Failure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-01-13  Sergio Villar Senin  <svillar@igalia.com>
+
+        REGRESSION(r268666) Incorrect vertical position inside grid items with padding
+        https://bugs.webkit.org/show_bug.cgi?id=220524
+
+        Reviewed by Manuel Rego Casasnovas.
+
+        In r268666 we sanitized and renamed the old overrideLogicalXXX sizes so that they store what they say.
+        There was a mistake in one of those renames, in availableLogicalHeightForPercentageComputation() we were
+        returning the border box size for the case of grid items. That's clearly wrong as we should return the
+        content box size. That's why adding a padding to a grid item was causing their children to wrongly
+        evaluate the available logical height.
+
+        This fixes a WPT that was marked as failure.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::availableLogicalHeightForPercentageComputation const): Return the
+        overridingContentLogicalHeight instead of the overridingLogicalHeight.
+
 2021-01-12  Antoine Quint  <graouts@webkit.org>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -3204 +3204 @@
         availableHeight = stretchedFlexHeight;
     else if (isGridItem() && hasOverridingLogicalHeight())
-        availableHeight = overridingLogicalHeight();
+        availableHeight = overridingContentLogicalHeight();
     else if (styleToUse.logicalHeight().isFixed()) {
         LayoutUnit contentBoxHeight = adjustContentBoxLogicalHeightForBoxSizing((LayoutUnit)styleToUse.logicalHeight().value());