| Index: Source/core/rendering/RenderFlexibleBox.cpp
|
| diff --git a/Source/core/rendering/RenderFlexibleBox.cpp b/Source/core/rendering/RenderFlexibleBox.cpp
|
| index 3f8b11f277a7e2958ce106052f8679f2fd632936..400c1c17f6d29a77aad1993679e05608b770bb5e 100644
|
| --- a/Source/core/rendering/RenderFlexibleBox.cpp
|
| +++ b/Source/core/rendering/RenderFlexibleBox.cpp
|
| @@ -135,7 +135,7 @@ static int synthesizedBaselineFromContentBox(const RenderBox* box, LineDirection
|
| return direction == HorizontalLine ? box->borderTop() + box->paddingTop() + box->contentHeight() : box->borderRight() + box->paddingRight() + box->contentWidth();
|
| }
|
|
|
| -int RenderFlexibleBox::baselinePosition(FontBaseline, bool, LineDirectionMode direction, LinePositionMode mode) const
|
| +int RenderFlexibleBox::baselinePosition(FontBaseline, OwnOrFirstLineStyle, LineDirectionMode direction, LinePositionMode mode) const
|
| {
|
| ASSERT(mode == PositionOnContainingLine);
|
| int baseline = firstLineBoxBaseline();
|
| @@ -665,7 +665,7 @@ void RenderFlexibleBox::layoutFlexItems(bool relayoutChildren)
|
| // Instead of just checking if we have a line, make sure the flexbox
|
| // has at least a line's worth of height to cover this case.
|
| LayoutUnit minHeight = borderAndPaddingLogicalHeight()
|
| - + lineHeight(true, isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes)
|
| + + lineHeight(FirstLineStyle, isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes)
|
| + scrollbarLogicalHeight();
|
| if (height() < minHeight)
|
| setLogicalHeight(minHeight);
|
|
|