| Index: Source/core/rendering/RenderDeprecatedFlexibleBox.cpp
|
| diff --git a/Source/core/rendering/RenderDeprecatedFlexibleBox.cpp b/Source/core/rendering/RenderDeprecatedFlexibleBox.cpp
|
| index 0e8c492832e24ee0c77f761db697db881847e010..4c11eef5b2ec8d4b7ef827e78c3799322f7297c7 100644
|
| --- a/Source/core/rendering/RenderDeprecatedFlexibleBox.cpp
|
| +++ b/Source/core/rendering/RenderDeprecatedFlexibleBox.cpp
|
| @@ -401,7 +401,7 @@ void RenderDeprecatedFlexibleBox::layoutHorizontalBox(bool relayoutChildren)
|
| }
|
|
|
| if (!iterator.first() && hasLineIfEmpty())
|
| - setHeight(height() + lineHeight(true, style()->isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes));
|
| + setHeight(height() + lineHeight(FirstLineStyle, style()->isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes));
|
|
|
| setHeight(height() + toAdd);
|
|
|
| @@ -717,7 +717,7 @@ void RenderDeprecatedFlexibleBox::layoutVerticalBox(bool relayoutChildren)
|
| yPos = height();
|
|
|
| if (!iterator.first() && hasLineIfEmpty())
|
| - setHeight(height() + lineHeight(true, style()->isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes));
|
| + setHeight(height() + lineHeight(FirstLineStyle, style()->isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes));
|
|
|
| setHeight(height() + toAdd);
|
|
|
| @@ -934,7 +934,7 @@ void RenderDeprecatedFlexibleBox::applyLineClamp(FlexBoxIterator& iterator, bool
|
| const UChar ellipsisAndSpace[2] = { horizontalEllipsis, ' ' };
|
| DEFINE_STATIC_LOCAL(AtomicString, ellipsisAndSpaceStr, (ellipsisAndSpace, 2));
|
| DEFINE_STATIC_LOCAL(AtomicString, ellipsisStr, (&horizontalEllipsis, 1));
|
| - const Font& font = style(numVisibleLines == 1)->font();
|
| + const Font& font = style(numVisibleLines == 1 ? FirstLineStyle : OwnStyle)->font();
|
|
|
| // Get ellipsis width, and if the last child is an anchor, it will go after the ellipsis, so add in a space and the anchor width too
|
| float totalWidth;
|
|
|