Changeset 138668 in webkit

Timestamp:

Jan 2, 2013 3:54:21 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

When a block's height is determined by min-height/max-height, children with percentage heights are sized incorrectly
​https://bugs.webkit.org/show_bug.cgi?id=26559

Patch by Bem Jones-Bey <Bem Jones-Bey> on 2013-01-02
Reviewed by Tony Chang.

Source/WebCore:

Percentage logical height computation now takes into account the min and max height of the container.

Test: fast/block/min-max-height-percent-height-child.html

• rendering/RenderBox.cpp:

(WebCore::RenderBox::constrainContentBoxLogicalHeightByMinMax): Added. Like constrainLogicalHeightByMinMax,

but constrains the content box instead of the border box.

(WebCore):
(WebCore::RenderBox::computeContentLogicalHeight): Make const so it can be called from the const method

constrainContentBoxLogicalHeightByMinMax.

(WebCore::RenderBox::computePercentageLogicalHeight): Use constrainContentBoxLogicalHeightByMinMax to properly

respect min and max height on the containing box when computing the percentage height.

• rendering/RenderBox.h:

(RenderBox):

LayoutTests:

Add tests to ensure percent heights are correctly determined.

• fast/block/min-max-height-percent-height-child-expected.txt: Added.
• fast/block/min-max-height-percent-height-child.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/block/min-max-height-percent-height-child-expected.txt (added)
• LayoutTests/fast/block/min-max-height-percent-height-child.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (4 diffs)
• Source/WebCore/rendering/RenderBox.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-02  Bem Jones-Bey  <bjonesbe@adobe.com>
+
+        When a block's height is determined by min-height/max-height, children with percentage heights are sized incorrectly
+        https://bugs.webkit.org/show_bug.cgi?id=26559
+
+        Reviewed by Tony Chang.
+
+        Add tests to ensure percent heights are correctly determined.
+
+        * fast/block/min-max-height-percent-height-child-expected.txt: Added.
+        * fast/block/min-max-height-percent-height-child.html: Added.
+
 2013-01-02  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-02  Bem Jones-Bey  <bjonesbe@adobe.com>
+
+        When a block's height is determined by min-height/max-height, children with percentage heights are sized incorrectly
+        https://bugs.webkit.org/show_bug.cgi?id=26559
+
+        Reviewed by Tony Chang.
+
+        Percentage logical height computation now takes into account the min and max height of the container.
+
+        Test: fast/block/min-max-height-percent-height-child.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::constrainContentBoxLogicalHeightByMinMax): Added. Like constrainLogicalHeightByMinMax,
+            but constrains the content box instead of the border box.
+        (WebCore):
+        (WebCore::RenderBox::computeContentLogicalHeight): Make const so it can be called from the const method
+            constrainContentBoxLogicalHeightByMinMax.
+        (WebCore::RenderBox::computePercentageLogicalHeight): Use constrainContentBoxLogicalHeightByMinMax to properly
+            respect min and max height on the containing box when computing the percentage height.
+        * rendering/RenderBox.h:
+        (RenderBox):
+
 2013-01-02  Tony Chang  <tony@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -471 +471 @@
 }
 
+LayoutUnit RenderBox::constrainContentBoxLogicalHeightByMinMax(LayoutUnit logicalHeight) const
+{
+    RenderStyle* styleToUse = style();
+    if (!styleToUse->logicalMaxHeight().isUndefined()) {
+        LayoutUnit maxH = computeContentLogicalHeight(MaxSize, styleToUse->logicalMaxHeight());
+        if (maxH != -1)
+            logicalHeight = min(logicalHeight, maxH);
+    }
+    return max(logicalHeight, computeContentLogicalHeight(MinSize, styleToUse->logicalMinHeight()));
+}
+
 IntRect RenderBox::absoluteContentBox() const
 {
@@ -2299 +2310 @@
 }
 
-LayoutUnit RenderBox::computeContentLogicalHeight(SizeType heightType, const Length& height)
+LayoutUnit RenderBox::computeContentLogicalHeight(SizeType heightType, const Length& height) const
 {
     LayoutUnit heightIncludingScrollbar = computeContentAndScrollbarLogicalHeightUsing(heightType, height);
@@ -2382 +2393 @@
         }
     } else if (cbstyle->logicalHeight().isFixed()) {
-        LayoutUnit contentBoxHeightWithScrollbar = cb->adjustContentBoxLogicalHeightForBoxSizing(cbstyle->logicalHeight().value());
-        availableHeight = max<LayoutUnit>(0, contentBoxHeightWithScrollbar - cb->scrollbarLogicalHeight());
+        LayoutUnit contentBoxHeight = cb->adjustContentBoxLogicalHeightForBoxSizing(cbstyle->logicalHeight().value());
+        availableHeight = max<LayoutUnit>(0, cb->constrainContentBoxLogicalHeightByMinMax(contentBoxHeight - cb->scrollbarLogicalHeight()));
     } else if (cbstyle->logicalHeight().isPercent() && !isOutOfFlowPositionedWithSpecifiedHeight) {
         // We need to recur and compute the percentage height for our containing block.
@@ -2389 +2400 @@
         if (heightWithScrollbar != -1) {
             LayoutUnit contentBoxHeightWithScrollbar = cb->adjustContentBoxLogicalHeightForBoxSizing(heightWithScrollbar);
-            availableHeight = max<LayoutUnit>(0, contentBoxHeightWithScrollbar - cb->scrollbarLogicalHeight());
+            // We need to adjust for min/max height because this method does not
+            // handle the min/max of the current block, its caller does. So the
+            // return value from the recursive call will not have been adjusted
+            // yet.
+            LayoutUnit contentBoxHeight = cb->constrainContentBoxLogicalHeightByMinMax(contentBoxHeightWithScrollbar - cb->scrollbarLogicalHeight());
+            availableHeight = max<LayoutUnit>(0, contentBoxHeight);
         }
     } else if (cb->isRenderView() || isOutOfFlowPositionedWithSpecifiedHeight) {

trunk/Source/WebCore/rendering/RenderBox.h

@@ -83 +83 @@
     LayoutUnit constrainLogicalWidthInRegionByMinMax(LayoutUnit, LayoutUnit, RenderBlock*, RenderRegion* = 0, LayoutUnit offsetFromLogicalTopOfFirstPage = 0) const;
     LayoutUnit constrainLogicalHeightByMinMax(LayoutUnit) const;
+    LayoutUnit constrainContentBoxLogicalHeightByMinMax(LayoutUnit) const;
 
     int pixelSnappedLogicalHeight() const { return style()->isHorizontalWritingMode() ? pixelSnappedHeight() : pixelSnappedWidth(); }
@@ -414 +415 @@
     LayoutUnit computeLogicalWidthInRegionUsing(SizeType, LayoutUnit availableLogicalWidth, const RenderBlock* containingBlock, RenderRegion*, LayoutUnit offsetFromLogicalTopOfFirstPage) const;
     LayoutUnit computeLogicalHeightUsing(SizeType, const Length& height) const;
-    LayoutUnit computeContentLogicalHeight(SizeType, const Length& height);
+    LayoutUnit computeContentLogicalHeight(SizeType, const Length& height) const;
     LayoutUnit computeContentAndScrollbarLogicalHeightUsing(SizeType, const Length& height) const;
     LayoutUnit computeReplacedLogicalWidthUsing(SizeType, Length width) const;