| Index: third_party/WebKit/Source/core/layout/LayoutMultiColumnSet.h
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutMultiColumnSet.h b/third_party/WebKit/Source/core/layout/LayoutMultiColumnSet.h
|
| index d92d9735c62f0033389ae67afca5a111720a167c..d07984a01fb7951c58245dd9aabb9df54dd0501f 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutMultiColumnSet.h
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutMultiColumnSet.h
|
| @@ -149,7 +149,10 @@ class CORE_EXPORT LayoutMultiColumnSet : public LayoutBlockFlow {
|
| LayoutUnit logicalTopInFlowThread() const;
|
| LayoutUnit logicalBottomInFlowThread() const;
|
| LayoutUnit logicalHeightInFlowThread() const {
|
| - return logicalBottomInFlowThread() - logicalTopInFlowThread();
|
| + // Due to negative margins, logical bottom may actually end up above logical
|
| + // top, but we never want to return negative logical heights.
|
| + return (logicalBottomInFlowThread() - logicalTopInFlowThread())
|
| + .clampNegativeToZero();
|
| }
|
|
|
| // Return the amount of flow thread contents that the specified fragmentainer
|
|
|