| Index: third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp b/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp
|
| index 21083bc7fbe2443d0340ab40c2e81e8f6b7f9e0c..53f8ba04fcd2d54b7e7ae0d96946e633225190c0 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp
|
| @@ -113,8 +113,9 @@ static inline bool canContainSpannerInParentFragmentationContext(
|
| static inline bool hasAnyColumnSpanners(
|
| const LayoutMultiColumnFlowThread& flowThread) {
|
| LayoutBox* firstBox = flowThread.firstMultiColumnBox();
|
| - return firstBox && (firstBox != flowThread.lastMultiColumnBox() ||
|
| - firstBox->isLayoutMultiColumnSpannerPlaceholder());
|
| + return firstBox &&
|
| + (firstBox != flowThread.lastMultiColumnBox() ||
|
| + firstBox->isLayoutMultiColumnSpannerPlaceholder());
|
| }
|
|
|
| // Find the next layout object that has the multicol container in its containing
|
| @@ -422,10 +423,9 @@ LayoutPoint LayoutMultiColumnFlowThread::visualPointToFlowThreadPoint(
|
| if (candidate->logicalBottom() > blockOffset)
|
| break;
|
| }
|
| - return columnSet
|
| - ? columnSet->visualPointToFlowThreadPoint(toLayoutPoint(
|
| - visualPoint + location() - columnSet->location()))
|
| - : visualPoint;
|
| + return columnSet ? columnSet->visualPointToFlowThreadPoint(toLayoutPoint(
|
| + visualPoint + location() - columnSet->location()))
|
| + : visualPoint;
|
| }
|
|
|
| int LayoutMultiColumnFlowThread::inlineBlockBaseline(
|
| @@ -724,8 +724,9 @@ void LayoutMultiColumnFlowThread::calculateColumnCountAndWidth(
|
| .clampNegativeToZero();
|
| } else if (!columnStyle->hasAutoColumnWidth() &&
|
| columnStyle->hasAutoColumnCount()) {
|
| - count = std::max(LayoutUnit(1), (availableWidth + columnGap) /
|
| - (computedColumnWidth + columnGap))
|
| + count = std::max(LayoutUnit(1),
|
| + (availableWidth + columnGap) /
|
| + (computedColumnWidth + columnGap))
|
| .toUnsigned();
|
| width = ((availableWidth + columnGap) / count) - columnGap;
|
| } else {
|
|
|