Add PageBoundaryRule parameter to columnSetAtBlockOffset().

third_party/WebKit/Source/core/layout/LayoutFlowThread.cpp

Index: third_party/WebKit/Source/core/layout/LayoutFlowThread.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutFlowThread.cpp b/third_party/WebKit/Source/core/layout/LayoutFlowThread.cpp
index d0cfc78588035007f4c1e4325e25a5d17bb28d95..8b4bd6719ef78051ad1afa6a6fe0bc16beb7baa3 100644
--- a/third_party/WebKit/Source/core/layout/LayoutFlowThread.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutFlowThread.cpp
@@ -130,7 +130,7 @@ bool LayoutFlowThread::nodeAtPoint(HitTestResult& result, const HitTestLocation&
 
 LayoutUnit LayoutFlowThread::pageLogicalHeightForOffset(LayoutUnit offset)
 {
-    LayoutMultiColumnSet* columnSet = columnSetAtBlockOffset(offset);
+    LayoutMultiColumnSet* columnSet = columnSetAtBlockOffset(offset, AssociateWithLatterPage);
     if (!columnSet)
         return LayoutUnit();
 
@@ -139,7 +139,7 @@ LayoutUnit LayoutFlowThread::pageLogicalHeightForOffset(LayoutUnit offset)
 
 LayoutUnit LayoutFlowThread::pageRemainingLogicalHeightForOffset(LayoutUnit offset, PageBoundaryRule pageBoundaryRule)
 {
-    LayoutMultiColumnSet* columnSet = columnSetAtBlockOffset(offset);
+    LayoutMultiColumnSet* columnSet = columnSetAtBlockOffset(offset, pageBoundaryRule);
     if (!columnSet)
         return LayoutUnit();
 
@@ -157,7 +157,7 @@ void LayoutFlowThread::generateColumnSetIntervalTree()
 
 LayoutUnit LayoutFlowThread::nextLogicalTopForUnbreakableContent(LayoutUnit flowThreadOffset, LayoutUnit contentLogicalHeight) const
 {
-    LayoutMultiColumnSet* columnSet = columnSetAtBlockOffset(flowThreadOffset);
+    LayoutMultiColumnSet* columnSet = columnSetAtBlockOffset(flowThreadOffset, AssociateWithLatterPage);
     if (!columnSet)
         return flowThreadOffset;
     return columnSet->nextLogicalTopForUnbreakableContent(flowThreadOffset, contentLogicalHeight);