| Index: third_party/WebKit/Source/core/layout/ColumnBalancer.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/ColumnBalancer.cpp b/third_party/WebKit/Source/core/layout/ColumnBalancer.cpp
|
| index a16a4d7ce37e8253f2e49e82f781f981a6d6b34f..d7f74d705ae51d6844a233aeaff4b0055cb78f2d 100644
|
| --- a/third_party/WebKit/Source/core/layout/ColumnBalancer.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/ColumnBalancer.cpp
|
| @@ -52,7 +52,7 @@ void ColumnBalancer::traverseLines(const LayoutBlockFlow& blockFlow) {
|
| void ColumnBalancer::traverseChildren(const LayoutObject& object) {
|
| // The break-after value from the previous in-flow block-level object to be
|
| // joined with the break-before value of the next in-flow block-level sibling.
|
| - EBreak previousBreakAfterValue = BreakAuto;
|
| + EBreakBetween previousBreakAfterValue = EBreakBetween::kAuto;
|
|
|
| for (const LayoutObject* child = object.slowFirstChild(); child;
|
| child = child->nextSibling()) {
|
| @@ -172,7 +172,7 @@ LayoutUnit InitialColumnHeightFinder::initialMinimalBalancedHeight() const {
|
| void InitialColumnHeightFinder::examineBoxAfterEntering(
|
| const LayoutBox& box,
|
| LayoutUnit childLogicalHeight,
|
| - EBreak previousBreakAfterValue) {
|
| + EBreakBetween previousBreakAfterValue) {
|
| if (m_lastBreakSeen > flowThreadOffset()) {
|
| // We have moved backwards. We're probably in a parallel flow, caused by
|
| // floats, sibling table cells, etc.
|
| @@ -361,7 +361,7 @@ MinimumSpaceShortageFinder::MinimumSpaceShortageFinder(
|
| void MinimumSpaceShortageFinder::examineBoxAfterEntering(
|
| const LayoutBox& box,
|
| LayoutUnit childLogicalHeight,
|
| - EBreak previousBreakAfterValue) {
|
| + EBreakBetween previousBreakAfterValue) {
|
| LayoutBox::PaginationBreakability breakability =
|
| box.getPaginationBreakability();
|
|
|
|
|