| Index: third_party/WebKit/Source/core/layout/LayoutBlockFlow.h
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.h b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.h
|
| index 846fb58e3b7bb1ae5dd9d7f8b34fa279fd3eac70..68e235505e8c1d701348566a949e63623bd338a4 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.h
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.h
|
| @@ -677,8 +677,8 @@ class CORE_EXPORT LayoutBlockFlow : public LayoutBlock {
|
| positiveMarginAfterDefault(block),
|
| negativeMarginAfterDefault(block)),
|
| m_multiColumnFlowThread(nullptr),
|
| - m_breakBefore(BreakAuto),
|
| - m_breakAfter(BreakAuto),
|
| + m_breakBefore(static_cast<unsigned>(EBreakBetween::kAuto)),
|
| + m_breakAfter(static_cast<unsigned>(EBreakBetween::kAuto)),
|
| m_lineBreakToAvoidWidow(-1),
|
| m_didBreakAtLineToAvoidWidow(false),
|
| m_discardMarginBefore(false),
|
| @@ -814,12 +814,12 @@ class CORE_EXPORT LayoutBlockFlow : public LayoutBlock {
|
|
|
| // Apply any forced fragmentainer break that's set on the current class A
|
| // break point.
|
| - LayoutUnit applyForcedBreak(LayoutUnit logicalOffset, EBreak);
|
| + LayoutUnit applyForcedBreak(LayoutUnit logicalOffset, EBreakBetween);
|
|
|
| - void setBreakBefore(EBreak);
|
| - void setBreakAfter(EBreak);
|
| - EBreak breakBefore() const override;
|
| - EBreak breakAfter() const override;
|
| + void setBreakBefore(EBreakBetween);
|
| + void setBreakAfter(EBreakBetween);
|
| + EBreakBetween breakBefore() const override;
|
| + EBreakBetween breakAfter() const override;
|
|
|
| LayoutUnit adjustBlockChildForPagination(LayoutUnit logicalTop,
|
| LayoutBox& child,
|
|
|