Changeset 269717 in webkit

Timestamp:

Nov 11, 2020 10:24:45 PM (21 months ago)

Author:

commit-queue@webkit.org

Message:

[css-grid] Percentage height on replaced item with scrollbar
​https://bugs.webkit.org/show_bug.cgi?id=191462

Patch by Ziran Sun <Ziran Sun> on 2020-11-11
Reviewed by Manuel Rego Casasnovas.

This CL is to subtract scrollbar in computeReplacedLogicalHeightUsing().
In RenderBox::computeReplacedLogicalHeightUsing() we should also subtract
scrollbarLogicalHeight() when calculating stretchHeight. Without this subtraction,
it caused issues to resolve the percentage heights on grid item replaced children,
if the grid item has a scrollbar.

It ports the changes from the following patch at Chromium:
​https://bugs.chromium.org/p/chromium/issues/detail?id=837141
Test files were already ported in WPT at
​https://github.com/web-platform-tests/wpt/commit/538eedafb15733c6113b44998170a6bbdae7518b

• rendering/RenderBox.cpp:

(WebCore::RenderBox::computeReplacedLogicalHeightUsing const):

Location:

trunk

Files:

• LayoutTests/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (3 diffs)

trunk/LayoutTests/TestExpectations

@@ -1187 +1187 @@
 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/191462 imported/w3c/web-platform-tests/css/css-grid/grid-items/percentage-size-replaced-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 @@
+2020-11-11  Ziran Sun  <zsun@igalia.com>
+
+        [css-grid] Percentage height on replaced item with scrollbar
+        https://bugs.webkit.org/show_bug.cgi?id=191462
+        
+        Reviewed by Manuel Rego Casasnovas.
+
+        This CL is to subtract scrollbar in computeReplacedLogicalHeightUsing().
+        In RenderBox::computeReplacedLogicalHeightUsing() we should also subtract
+        scrollbarLogicalHeight() when calculating stretchHeight. Without this subtraction,
+        it caused issues to resolve the percentage heights on grid item replaced children,
+        if the grid item has a scrollbar.
+        
+        It ports the changes from the following patch at Chromium:
+        https://bugs.chromium.org/p/chromium/issues/detail?id=837141
+        Test files were already ported in WPT at
+        https://github.com/web-platform-tests/wpt/commit/538eedafb15733c6113b44998170a6bbdae7518b
+        
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::computeReplacedLogicalHeightUsing const):
+
 2020-11-11  Said Abou-Hallawa  <said@apple.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -3192 +3192 @@
                 container = container->containingBlock();
             }
+            bool hasPerpendicularContainingBlock = container->isHorizontalWritingMode() != isHorizontalWritingMode();
             Optional<LayoutUnit> stretchedHeight;
             if (is<RenderBlock>(container)) {
@@ -3198 +3199 @@
                 if (block->isFlexItem())
                     stretchedHeight = downcast<RenderFlexibleBox>(block->parent())->childLogicalHeightForPercentageResolution(*block);
-                else if (block->isGridItem() && block->hasOverridingLogicalHeight())
-                    stretchedHeight = block->overridingLogicalHeight() - block->borderAndPaddingLogicalHeight();
+                else if (block->isGridItem() && block->hasOverridingLogicalHeight() && !hasPerpendicularContainingBlock)
+                    stretchedHeight = block->overridingContentLogicalHeight();
             }
 
@@ -3223 +3224 @@
                 availableHeight = stretchedHeight.value();
             else {
-                availableHeight = containingBlockLogicalHeightForContent(IncludeMarginBorderPadding);
+                availableHeight = hasPerpendicularContainingBlock ? containingBlockLogicalWidthForContent() : containingBlockLogicalHeightForContent(IncludeMarginBorderPadding);
                 // It is necessary to use the border-box to match WinIE's broken
                 // box model.  This is essential for sizing inside