| Index: third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.h
|
| diff --git a/third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.h b/third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.h
|
| index 3cd5bba85dee25a2d99765777f493b93f2cc1f56..225510f3722c5f0c4823cae9133be93e5696a374 100644
|
| --- a/third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.h
|
| +++ b/third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.h
|
| @@ -63,14 +63,17 @@ class MultiColumnFragmentainerGroup {
|
| return m_logicalBottomInFlowThread;
|
| }
|
| void setLogicalBottomInFlowThread(LayoutUnit logicalBottomInFlowThread) {
|
| - ASSERT(logicalBottomInFlowThread >= m_logicalTopInFlowThread);
|
| m_logicalBottomInFlowThread = logicalBottomInFlowThread;
|
| }
|
|
|
| - // The height of our flow thread portion
|
| + // The height of the flow thread portion for the entire fragmentainer group.
|
| LayoutUnit logicalHeightInFlowThread() const {
|
| - return m_logicalBottomInFlowThread - m_logicalTopInFlowThread;
|
| + return (m_logicalBottomInFlowThread - m_logicalTopInFlowThread)
|
| + .clampNegativeToZero();
|
| }
|
| + // The height of the flow thread portion for the specified fragmentainer.
|
| + // The last fragmentainer may not be using all available space.
|
| + LayoutUnit logicalHeightInFlowThreadAt(unsigned columnIndex) const;
|
|
|
| void resetColumnHeight();
|
| bool recalculateColumnHeight(LayoutMultiColumnSet&);
|
|
|