| Index: third_party/WebKit/Source/core/layout/LayoutMultiColumnSet.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutMultiColumnSet.cpp b/third_party/WebKit/Source/core/layout/LayoutMultiColumnSet.cpp
|
| index d72be73a51463b16d41c27f51a54ebdfeb10b149..1a95b9c60e7b31ea7de274a18420b1761ced0d6e 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutMultiColumnSet.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutMultiColumnSet.cpp
|
| @@ -145,12 +145,12 @@ LayoutMultiColumnSet* LayoutMultiColumnSet::previousSiblingMultiColumnSet() cons
|
| return nullptr;
|
| }
|
|
|
| -bool LayoutMultiColumnSet::hasFragmentainerGroupForColumnAt(LayoutUnit offsetInFlowThread) const
|
| +bool LayoutMultiColumnSet::hasFragmentainerGroupForColumnAt(LayoutUnit bottomOffsetInFlowThread) const
|
| {
|
| const MultiColumnFragmentainerGroup& lastRow = lastFragmentainerGroup();
|
| - if (lastRow.logicalTopInFlowThread() > offsetInFlowThread)
|
| + if (lastRow.logicalTopInFlowThread() > bottomOffsetInFlowThread)
|
| return true;
|
| - return offsetInFlowThread - lastRow.logicalTopInFlowThread() < lastRow.logicalHeight() * usedColumnCount();
|
| + return bottomOffsetInFlowThread - lastRow.logicalTopInFlowThread() <= lastRow.logicalHeight() * usedColumnCount();
|
| }
|
|
|
| MultiColumnFragmentainerGroup& LayoutMultiColumnSet::appendNewFragmentainerGroup()
|
| @@ -163,7 +163,6 @@ MultiColumnFragmentainerGroup& LayoutMultiColumnSet::appendNewFragmentainerGroup
|
| LayoutUnit blockOffsetInFlowThread = previousGroup.logicalTopInFlowThread() + previousGroup.logicalHeight() * usedColumnCount();
|
| previousGroup.setLogicalBottomInFlowThread(blockOffsetInFlowThread);
|
| newGroup.setLogicalTopInFlowThread(blockOffsetInFlowThread);
|
| -
|
| newGroup.setLogicalTop(previousGroup.logicalTop() + previousGroup.logicalHeight());
|
| newGroup.resetColumnHeight();
|
| }
|
|
|