Changeset 202856 in webkit

Timestamp:

Jul 6, 2016 6:02:43 AM (8 years ago)

Author:

Manuel Rego Casasnovas

Message:

[css-grid] Height percentages are not properly resolved for item's children
​https://bugs.webkit.org/show_bug.cgi?id=159258

Reviewed by Sergio Villar Senin.

Source/WebCore:

When grid items are vertically stretched (default behavior)
they store their height on RenderBox::overrideLogicalContentHeight().
In order to resolve the percentage height on the grid item's children
we need to use that size.

Test: fast/css-grid-layout/percent-resolution-grid-item-children.html

• rendering/RenderBox.cpp:

(WebCore::RenderBox::computePercentageLogicalHeight):

LayoutTests:

• fast/css-grid-layout/percent-resolution-grid-item-children-expected.txt: Added.
• fast/css-grid-layout/percent-resolution-grid-item-children.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css-grid-layout/percent-resolution-grid-item-children-expected.txt (added)
• LayoutTests/fast/css-grid-layout/percent-resolution-grid-item-children.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-07-06  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [css-grid] Height percentages are not properly resolved for item's children
+        https://bugs.webkit.org/show_bug.cgi?id=159258
+
+        Reviewed by Sergio Villar Senin.
+
+        * fast/css-grid-layout/percent-resolution-grid-item-children-expected.txt: Added.
+        * fast/css-grid-layout/percent-resolution-grid-item-children.html: Added.
+
 2016-07-05  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-07-06  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [css-grid] Height percentages are not properly resolved for item's children
+        https://bugs.webkit.org/show_bug.cgi?id=159258
+
+        Reviewed by Sergio Villar Senin.
+
+        When grid items are vertically stretched (default behavior)
+        they store their height on RenderBox::overrideLogicalContentHeight().
+        In order to resolve the percentage height on the grid item's children
+        we need to use that size.
+
+        Test: fast/css-grid-layout/percent-resolution-grid-item-children.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::computePercentageLogicalHeight):
+
 2016-07-06  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -2990 +2990 @@
     else if (hasOverrideContainingBlockLogicalHeight())
         availableHeight = overrideContainingBlockContentLogicalHeight();
+    else if (cb->isGridItem() && cb->hasOverrideLogicalContentHeight())
+        availableHeight = cb->overrideLogicalContentHeight();
 #endif
     else if (is<RenderTableCell>(*cb)) {