| Index: third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp b/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp
|
| index 7328c89a284079e8cfeb459a15e62b61c3fbb8b9..5b3487baadb9bb613031723c661429ccc5dac734 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp
|
| @@ -394,9 +394,10 @@ static void updateLogicalWidthForLeftAlignedBlock(
|
| // left.
|
| if (isLeftToRightDirection) {
|
| if (totalLogicalWidth > availableLogicalWidth && trailingSpaceRun)
|
| - trailingSpaceRun->m_box->setLogicalWidth(std::max(
|
| - LayoutUnit(), trailingSpaceRun->m_box->logicalWidth() -
|
| - totalLogicalWidth + availableLogicalWidth));
|
| + trailingSpaceRun->m_box->setLogicalWidth(
|
| + std::max(LayoutUnit(),
|
| + trailingSpaceRun->m_box->logicalWidth() - totalLogicalWidth +
|
| + availableLogicalWidth));
|
| return;
|
| }
|
|
|
| @@ -427,8 +428,9 @@ static void updateLogicalWidthForRightAlignedBlock(
|
|
|
| if (totalLogicalWidth > availableLogicalWidth && trailingSpaceRun) {
|
| trailingSpaceRun->m_box->setLogicalWidth(
|
| - std::max(LayoutUnit(), trailingSpaceRun->m_box->logicalWidth() -
|
| - totalLogicalWidth + availableLogicalWidth));
|
| + std::max(LayoutUnit(),
|
| + trailingSpaceRun->m_box->logicalWidth() - totalLogicalWidth +
|
| + availableLogicalWidth));
|
| totalLogicalWidth -= trailingSpaceRun->m_box->logicalWidth();
|
| } else {
|
| logicalLeft += availableLogicalWidth - totalLogicalWidth;
|
| @@ -1203,9 +1205,9 @@ void LayoutBlockFlow::layoutRunsAndFloatsInRange(
|
| adjustLinePositionForPagination(*lineBox, adjustment);
|
| if (adjustment) {
|
| LayoutUnit oldLineWidth = availableLogicalWidthForLine(
|
| - oldLogicalHeight, layoutState.lineInfo().isFirstLine()
|
| - ? IndentText
|
| - : DoNotIndentText);
|
| + oldLogicalHeight,
|
| + layoutState.lineInfo().isFirstLine() ? IndentText
|
| + : DoNotIndentText);
|
| lineBox->moveInBlockDirection(adjustment);
|
| if (availableLogicalWidthForLine(
|
| oldLogicalHeight + adjustment,
|
| @@ -1985,10 +1987,11 @@ void LayoutBlockFlow::layoutInlineChildren(bool relayoutChildren,
|
| setLogicalHeight(logicalHeight() + lastLineAnnotationsAdjustment + afterEdge);
|
|
|
| if (!firstLineBox() && hasLineIfEmpty())
|
| - setLogicalHeight(logicalHeight() +
|
| - lineHeight(true, isHorizontalWritingMode() ? HorizontalLine
|
| - : VerticalLine,
|
| - PositionOfInteriorLineBoxes));
|
| + setLogicalHeight(
|
| + logicalHeight() +
|
| + lineHeight(true,
|
| + isHorizontalWritingMode() ? HorizontalLine : VerticalLine,
|
| + PositionOfInteriorLineBoxes));
|
|
|
| // See if we have any lines that spill out of our block. If we do, then we
|
| // will possibly need to truncate text.
|
|
|