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 33d90096ac510166caea24d724db83010000a380..14746b86ea35367464c59976618c85a7c317cd31 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutMultiColumnSet.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutMultiColumnSet.cpp |
@@ -88,6 +88,13 @@ LayoutUnit LayoutMultiColumnSet::pageRemainingLogicalHeightForOffset(LayoutUnit |
// question (i.e. no remaining space), rather than being part of the latter (i.e. one whole |
// column length of remaining space). |
remainingLogicalHeight = intMod(remainingLogicalHeight, pageLogicalHeight); |
+ } else if (!remainingLogicalHeight) { |
+ // When pageBoundaryRule is AssociateWithLatterPage, we should never return 0, because if |
+ // there's no space left, it means that we should be at a column boundary, in which case we |
+ // should return the amount of space remaining in the *next* column. But this is not true if |
+ // the offset is "infinite" (saturated), so allow this to happen in that case. |
+ ASSERT(offsetInFlowThread.mightBeSaturated()); |
+ remainingLogicalHeight = pageLogicalHeight; |
} |
return remainingLogicalHeight; |
} |