Index: Source/WebCore/rendering/RenderBox.h |
diff --git a/Source/WebCore/rendering/RenderBox.h b/Source/WebCore/rendering/RenderBox.h |
index 61e83de7c1e49800fd3e94abfe2b8691615b1f7c..18c4cfb68fa37ae2da4aa086d9498d5b3df37489 100644 |
--- a/Source/WebCore/rendering/RenderBox.h |
+++ b/Source/WebCore/rendering/RenderBox.h |
@@ -83,8 +83,9 @@ 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; |
+ // First argument is the height from style, second argument is the content height of the block (used for min-content/max-content) |
ojan
2013/04/11 03:21:46
In cases like this, you can just use variable name
cbiesinger
2013/04/12 01:17:52
Done.
|
+ LayoutUnit constrainLogicalHeightByMinMax(LayoutUnit, LayoutUnit) const; |
+ LayoutUnit constrainContentBoxLogicalHeightByMinMax(LayoutUnit, LayoutUnit) const; |
int pixelSnappedLogicalHeight() const { return style()->isHorizontalWritingMode() ? pixelSnappedHeight() : pixelSnappedWidth(); } |
int pixelSnappedLogicalWidth() const { return style()->isHorizontalWritingMode() ? pixelSnappedWidth() : pixelSnappedHeight(); } |
@@ -411,10 +412,10 @@ 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; |
ojan
2013/04/11 03:21:46
IMO, it isn't obvious without the name what the Le
cbiesinger
2013/04/12 01:17:52
Oh, that must have been a bad merge :( Fixed.
|
- LayoutUnit computeLogicalHeightUsing(const Length& height) const; |
- LayoutUnit computeContentLogicalHeight(const Length& height) const; |
- LayoutUnit computeContentAndScrollbarLogicalHeightUsing(const Length& height) const; |
+ LayoutUnit computeLogicalWidthInRegionUsing(SizeType, Length, LayoutUnit availableLogicalWidth, const RenderBlock* containingBlock, RenderRegion*, LayoutUnit offsetFromLogicalTopOfFirstPage) const; |
+ LayoutUnit computeLogicalHeightUsing(const Length& height, LayoutUnit contentHeight) const; |
+ LayoutUnit computeContentLogicalHeight(const Length& height, LayoutUnit contentHeight) const; |
+ LayoutUnit computeContentAndScrollbarLogicalHeightUsing(const Length& height, LayoutUnit contentHeight) const; |
LayoutUnit computeReplacedLogicalWidthUsing(Length width) const; |
LayoutUnit computeReplacedLogicalWidthRespectingMinMaxWidth(LayoutUnit logicalWidth, ShouldComputePreferred = ComputeActual) const; |
LayoutUnit computeReplacedLogicalHeightUsing(Length height) const; |