| Index: Source/core/rendering/RenderBox.cpp
|
| diff --git a/Source/core/rendering/RenderBox.cpp b/Source/core/rendering/RenderBox.cpp
|
| index b0cd4d79b14e72a0f184c0a89d600c638d763fe2..9065806479985f1f80bb518854c36db7b53f3472 100644
|
| --- a/Source/core/rendering/RenderBox.cpp
|
| +++ b/Source/core/rendering/RenderBox.cpp
|
| @@ -3663,18 +3663,18 @@ void RenderBox::computePositionedLogicalHeightUsing(Length logicalHeightLength,
|
| bool logicalBottomIsAuto = logicalBottom.isAuto();
|
| RenderView* renderView = view();
|
|
|
| + LayoutUnit resolvedLogicalHeight;
|
| // Height is never unsolved for tables.
|
| if (isTable()) {
|
| - logicalHeightLength.setValue(Fixed, contentLogicalHeight);
|
| + resolvedLogicalHeight = contentLogicalHeight;
|
| logicalHeightIsAuto = false;
|
| + } else {
|
| + if (logicalHeightLength.isIntrinsic())
|
| + resolvedLogicalHeight = computeIntrinsicLogicalContentHeightUsing(logicalHeightLength, contentLogicalHeight, bordersPlusPadding);
|
| + else
|
| + resolvedLogicalHeight = adjustContentBoxLogicalHeightForBoxSizing(valueForLength(logicalHeightLength, containerLogicalHeight, renderView));
|
| }
|
|
|
| - LayoutUnit resolvedLogicalHeight;
|
| - if (logicalHeightLength.isIntrinsic())
|
| - resolvedLogicalHeight = computeIntrinsicLogicalContentHeightUsing(logicalHeightLength, contentLogicalHeight, bordersPlusPadding);
|
| - else
|
| - resolvedLogicalHeight = adjustContentBoxLogicalHeightForBoxSizing(valueForLength(logicalHeightLength, containerLogicalHeight, renderView));
|
| -
|
| if (!logicalTopIsAuto && !logicalHeightIsAuto && !logicalBottomIsAuto) {
|
| /*-----------------------------------------------------------------------*\
|
| * If none of the three are 'auto': If both 'margin-top' and 'margin-
|
|
|