| Index: third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h
|
| diff --git a/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h b/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h
|
| index 44dafc2b8fe71ece38fba0ce900c6fe7c963df35..c361f221bc0855c2f5326ec9b9b8cc4c22c59f30 100644
|
| --- a/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h
|
| +++ b/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h
|
| @@ -214,7 +214,7 @@ inline bool requiresLineBox(const InlineIterator& it, const LineInfo& lineInfo =
|
| return notJustWhitespace || isEmptyInline(it.object());
|
| }
|
|
|
| -inline void setStaticPositions(LineLayoutBlockFlow block, LineLayoutBox child, bool shouldIndentText)
|
| +inline void setStaticPositions(LineLayoutBlockFlow block, LineLayoutBox child, IndentTextOrNot indentText)
|
| {
|
| ASSERT(child.isOutOfFlowPositioned());
|
| // FIXME: The math here is actually not really right. It's a best-guess approximation that
|
| @@ -225,14 +225,14 @@ inline void setStaticPositions(LineLayoutBlockFlow block, LineLayoutBox child, b
|
| // A relative positioned inline encloses us. In this case, we also have to determine our
|
| // position as though we were an inline. Set |staticInlinePosition| and |staticBlockPosition| on the relative positioned
|
| // inline so that we can obtain the value later.
|
| - LineLayoutInline(containerBlock).layer()->setStaticInlinePosition(block.startAlignedOffsetForLine(blockHeight, shouldIndentText));
|
| + LineLayoutInline(containerBlock).layer()->setStaticInlinePosition(block.startAlignedOffsetForLine(blockHeight, indentText));
|
| LineLayoutInline(containerBlock).layer()->setStaticBlockPosition(blockHeight);
|
|
|
| // If |child| is a leading or trailing positioned object this is its only opportunity to ensure it moves with an inline
|
| // container changing width.
|
| child.moveWithEdgeOfInlineContainerIfNecessary(child.isHorizontalWritingMode());
|
| }
|
| - block.updateStaticInlinePositionForChild(child, blockHeight, shouldIndentText);
|
| + block.updateStaticInlinePositionForChild(child, blockHeight, indentText);
|
| child.layer()->setStaticBlockPosition(blockHeight);
|
| }
|
|
|
| @@ -247,7 +247,7 @@ inline void BreakingContext::skipTrailingWhitespace(InlineIterator& iterator, co
|
| while (!iterator.atEnd() && !requiresLineBox(iterator, lineInfo, TrailingWhitespace)) {
|
| LineLayoutItem item = iterator.object();
|
| if (item.isOutOfFlowPositioned())
|
| - setStaticPositions(m_block, LineLayoutBox(item), false);
|
| + setStaticPositions(m_block, LineLayoutBox(item), DoNotIndentText);
|
| else if (item.isFloating())
|
| m_block.insertFloatingObject(LineLayoutBox(item));
|
| iterator.increment();
|
| @@ -974,14 +974,14 @@ inline void BreakingContext::commitAndUpdateLineBreakIfNeeded()
|
|
|
| inline IndentTextOrNot requiresIndent(bool isFirstLine, bool isAfterHardLineBreak, const ComputedStyle& style)
|
| {
|
| - IndentTextOrNot shouldIndentText = DoNotIndentText;
|
| + IndentTextOrNot indentText = DoNotIndentText;
|
| if (isFirstLine || (isAfterHardLineBreak && style.textIndentLine()) == TextIndentEachLine)
|
| - shouldIndentText = IndentText;
|
| + indentText = IndentText;
|
|
|
| if (style.textIndentType() == TextIndentHanging)
|
| - shouldIndentText = shouldIndentText == IndentText ? DoNotIndentText : IndentText;
|
| + indentText = indentText == IndentText ? DoNotIndentText : IndentText;
|
|
|
| - return shouldIndentText;
|
| + return indentText;
|
| }
|
|
|
| }
|
|
|