Index: Source/WebCore/rendering/RenderBox.h |
diff --git a/Source/WebCore/rendering/RenderBox.h b/Source/WebCore/rendering/RenderBox.h |
index 37cef960b19dbf55c72116539a7f663b40db6aad..547619638e42bbcdad82b823b605e40a50a4289f 100644 |
--- a/Source/WebCore/rendering/RenderBox.h |
+++ b/Source/WebCore/rendering/RenderBox.h |
@@ -83,8 +83,8 @@ public: |
LayoutUnit logicalHeight() const { return style()->isHorizontalWritingMode() ? height() : width(); } |
LayoutUnit constrainLogicalWidthInRegionByMinMax(LayoutUnit, LayoutUnit, RenderBlock*, RenderRegion* = 0, LayoutUnit offsetFromLogicalTopOfFirstPage = 0) const; |
- LayoutUnit constrainLogicalHeightByMinMax(LayoutUnit) const; |
- LayoutUnit constrainContentBoxLogicalHeightByMinMax(LayoutUnit) const; |
+ LayoutUnit constrainLogicalHeightByMinMax(LayoutUnit logicalHeight, LayoutUnit intrinsicContentHeight) const; |
+ LayoutUnit constrainContentBoxLogicalHeightByMinMax(LayoutUnit logicalHeight, LayoutUnit intrinsicContentHeight) const; |
int pixelSnappedLogicalHeight() const { return style()->isHorizontalWritingMode() ? pixelSnappedHeight() : pixelSnappedWidth(); } |
int pixelSnappedLogicalWidth() const { return style()->isHorizontalWritingMode() ? pixelSnappedWidth() : pixelSnappedHeight(); } |
@@ -412,9 +412,9 @@ public: |
LayoutUnit shrinkLogicalWidthToAvoidFloats(LayoutUnit childMarginStart, LayoutUnit childMarginEnd, const RenderBlock* cb, RenderRegion*, LayoutUnit offsetFromLogicalTopOfFirstPage) const; |
LayoutUnit computeLogicalWidthInRegionUsing(SizeType, Length logicalWidth, LayoutUnit availableLogicalWidth, const RenderBlock* containingBlock, RenderRegion*, LayoutUnit offsetFromLogicalTopOfFirstPage) const; |
- LayoutUnit computeLogicalHeightUsing(const Length& height) const; |
- LayoutUnit computeContentLogicalHeight(const Length& height) const; |
- LayoutUnit computeContentAndScrollbarLogicalHeightUsing(const Length& height) const; |
+ LayoutUnit computeLogicalHeightUsing(const Length& height, LayoutUnit intrinsicContentHeight) const; |
+ LayoutUnit computeContentLogicalHeight(const Length& height, LayoutUnit intrinsicContentHeight) const; |
+ LayoutUnit computeContentAndScrollbarLogicalHeightUsing(const Length& height, LayoutUnit intrinsicContentHeight) const; |
LayoutUnit computeReplacedLogicalWidthUsing(Length width) const; |
LayoutUnit computeReplacedLogicalWidthRespectingMinMaxWidth(LayoutUnit logicalWidth, ShouldComputePreferred = ComputeActual) const; |
LayoutUnit computeReplacedLogicalHeightUsing(Length height) const; |
@@ -610,6 +610,7 @@ protected: |
void computePositionedLogicalWidth(LogicalExtentComputedValues&, RenderRegion* = 0, LayoutUnit offsetFromLogicalTopOfFirstPage = 0) const; |
LayoutUnit computeIntrinsicLogicalWidthUsing(Length logicalWidthLength, LayoutUnit availableLogicalWidth, LayoutUnit borderAndPadding) const; |
+ LayoutUnit computeIntrinsicLogicalContentHeightUsing(Length logicalHeightLength, LayoutUnit intrinsicContentHeight, LayoutUnit borderAndPadding) const; |
virtual bool shouldComputeSizeAsReplaced() const { return isReplaced() && !isInlineBlockOrInlineTable(); } |