| Index: third_party/WebKit/Source/core/layout/LayoutBlockFlow.h
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.h b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.h
|
| index a85e6bbed8a594b78d068169f31c25dde86c40fa..a6e73d921dd1b2ff35818f22f9ef4c5839a683db 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.h
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.h
|
| @@ -133,16 +133,18 @@ class CORE_EXPORT LayoutBlockFlow : public LayoutBlock {
|
| LayoutUnit logicalHeight = LayoutUnit()) const {
|
| return style()->isLeftToRightDirection()
|
| ? logicalLeftOffsetForLine(position, indentText, logicalHeight)
|
| - : logicalWidth() - logicalRightOffsetForLine(
|
| - position, indentText, logicalHeight);
|
| + : logicalWidth() -
|
| + logicalRightOffsetForLine(position, indentText,
|
| + logicalHeight);
|
| }
|
| LayoutUnit endOffsetForLine(LayoutUnit position,
|
| IndentTextOrNot indentText,
|
| LayoutUnit logicalHeight = LayoutUnit()) const {
|
| return !style()->isLeftToRightDirection()
|
| ? logicalLeftOffsetForLine(position, indentText, logicalHeight)
|
| - : logicalWidth() - logicalRightOffsetForLine(
|
| - position, indentText, logicalHeight);
|
| + : logicalWidth() -
|
| + logicalRightOffsetForLine(position, indentText,
|
| + logicalHeight);
|
| }
|
|
|
| const LineBoxList& lineBoxes() const { return m_lineBoxes; }
|
| @@ -265,9 +267,10 @@ class CORE_EXPORT LayoutBlockFlow : public LayoutBlock {
|
| IndentTextOrNot = DoNotIndentText);
|
|
|
| static bool shouldSkipCreatingRunsForObject(LineLayoutItem obj) {
|
| - return obj.isFloating() || (obj.isOutOfFlowPositioned() &&
|
| - !obj.style()->isOriginalDisplayInlineType() &&
|
| - !obj.container().isLayoutInline());
|
| + return obj.isFloating() ||
|
| + (obj.isOutOfFlowPositioned() &&
|
| + !obj.style()->isOriginalDisplayInlineType() &&
|
| + !obj.container().isLayoutInline());
|
| }
|
|
|
| LayoutMultiColumnFlowThread* multiColumnFlowThread() const {
|
|
|