| Index: Source/core/rendering/line/LineWidth.cpp
|
| diff --git a/Source/core/rendering/line/LineWidth.cpp b/Source/core/rendering/line/LineWidth.cpp
|
| index 1b46843d9f4b7fd32b053d09cfac0cb24625f28d..40042abad60514c73891736a3fe4d1cc5a11eed2 100644
|
| --- a/Source/core/rendering/line/LineWidth.cpp
|
| +++ b/Source/core/rendering/line/LineWidth.cpp
|
| @@ -53,7 +53,7 @@ LineWidth::LineWidth(RenderBlockFlow& block, bool isFirstLine, IndentTextOrNot s
|
| void LineWidth::updateAvailableWidth(LayoutUnit replacedHeight)
|
| {
|
| LayoutUnit height = m_block.logicalHeight();
|
| - LayoutUnit logicalHeight = m_block.minLineHeightForReplacedRenderer(m_isFirstLine, replacedHeight);
|
| + LayoutUnit logicalHeight = m_block.minLineHeightForReplacedRenderer(m_isFirstLine ? FirstLineStyle : OwnStyle, replacedHeight);
|
| m_left = m_block.logicalLeftOffsetForLine(height, shouldIndentText(), logicalHeight).toFloat();
|
| m_right = m_block.logicalRightOffsetForLine(height, shouldIndentText(), logicalHeight).toFloat();
|
|
|
| @@ -68,7 +68,7 @@ void LineWidth::shrinkAvailableWidthForNewFloatIfNeeded(FloatingObject* newFloat
|
|
|
| ShapeOutsideInfo* shapeOutsideInfo = newFloat->renderer()->shapeOutsideInfo();
|
| if (shapeOutsideInfo) {
|
| - LayoutUnit lineHeight = m_block.lineHeight(m_isFirstLine, m_block.isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes);
|
| + LayoutUnit lineHeight = m_block.lineHeight(m_isFirstLine ? FirstLineStyle : OwnStyle, m_block.isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes);
|
| shapeOutsideInfo->updateDeltasForContainingBlockLine(m_block, *newFloat, m_block.logicalHeight(), lineHeight);
|
| }
|
|
|
| @@ -109,7 +109,7 @@ void LineWidth::applyOverhang(RenderRubyRun* rubyRun, RenderObject* startRendere
|
| {
|
| int startOverhang;
|
| int endOverhang;
|
| - rubyRun->getOverhang(m_isFirstLine, startRenderer, endRenderer, startOverhang, endOverhang);
|
| + rubyRun->getOverhang(m_isFirstLine ? FirstLineStyle : OwnStyle, startRenderer, endRenderer, startOverhang, endOverhang);
|
|
|
| startOverhang = std::min<int>(startOverhang, m_committedWidth);
|
| m_availableWidth += startOverhang;
|
| @@ -156,7 +156,7 @@ inline static bool isWholeLineFit(const RenderBlockFlow& block, const LayoutUnit
|
|
|
| void LineWidth::wrapNextToShapeOutside(bool isFirstLine)
|
| {
|
| - LayoutUnit lineHeight = m_block.lineHeight(isFirstLine, m_block.isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes);
|
| + LayoutUnit lineHeight = m_block.lineHeight(isFirstLine ? FirstLineStyle : OwnStyle, m_block.isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes);
|
| LayoutUnit lineLogicalTop = m_block.logicalHeight();
|
| LayoutUnit newLineTop = lineLogicalTop;
|
| LayoutUnit floatLogicalBottom = m_block.nextFloatLogicalBottomBelow(lineLogicalTop);
|
|
|