| Index: sky/engine/core/rendering/RenderBlockFlow.h
|
| diff --git a/sky/engine/core/rendering/RenderBlockFlow.h b/sky/engine/core/rendering/RenderBlockFlow.h
|
| index 8a4f58d8780737b6f1a2292541cc1ab5d8c8a5cf..6a42658397d8e8f5f2950f3a4f45bef60615dd6a 100644
|
| --- a/sky/engine/core/rendering/RenderBlockFlow.h
|
| +++ b/sky/engine/core/rendering/RenderBlockFlow.h
|
| @@ -156,7 +156,7 @@ protected:
|
| void determineLogicalLeftPositionForChild(RenderBox* child);
|
|
|
| private:
|
| - bool layoutBlockFlow(bool relayoutChildren, SubtreeLayoutScope&);
|
| + void layoutBlockFlow(bool relayoutChildren, SubtreeLayoutScope&);
|
| void layoutBlockChildren(bool relayoutChildren, SubtreeLayoutScope&, LayoutUnit beforeEdge, LayoutUnit afterEdge);
|
|
|
| void layoutBlockChild(RenderBox* child, MarginInfo&, LayoutUnit& previousFloatLogicalBottom);
|
| @@ -199,14 +199,6 @@ private:
|
|
|
| void updateLogicalWidthForAlignment(const ETextAlign&, const RootInlineBox*, BidiRun* trailingSpaceRun, float& logicalLeft, float& totalLogicalWidth, float& availableLogicalWidth, unsigned expansionOpportunityCount);
|
|
|
| - bool shouldBreakAtLineToAvoidWidow() const { return m_rareData && m_rareData->m_lineBreakToAvoidWidow >= 0; }
|
| - void clearShouldBreakAtLineToAvoidWidow() const;
|
| - int lineBreakToAvoidWidow() const { return m_rareData ? m_rareData->m_lineBreakToAvoidWidow : -1; }
|
| - void setBreakAtLineToAvoidWidow(int);
|
| - void clearDidBreakAtLineToAvoidWidow();
|
| - void setDidBreakAtLineToAvoidWidow();
|
| - bool didBreakAtLineToAvoidWidow() const { return m_rareData && m_rareData->m_didBreakAtLineToAvoidWidow; }
|
| -
|
| public:
|
| struct FloatWithRect {
|
| FloatWithRect(RenderBox* f)
|
| @@ -254,8 +246,6 @@ public:
|
| public:
|
| RenderBlockFlowRareData(const RenderBlockFlow* block)
|
| : m_margins(positiveMarginBeforeDefault(block), negativeMarginBeforeDefault(block), positiveMarginAfterDefault(block), negativeMarginAfterDefault(block))
|
| - , m_lineBreakToAvoidWidow(-1)
|
| - , m_didBreakAtLineToAvoidWidow(false)
|
| , m_discardMarginBefore(false)
|
| , m_discardMarginAfter(false)
|
| {
|
| @@ -280,9 +270,6 @@ public:
|
| }
|
|
|
| MarginValues m_margins;
|
| -
|
| - int m_lineBreakToAvoidWidow;
|
| - bool m_didBreakAtLineToAvoidWidow : 1;
|
| bool m_discardMarginBefore : 1;
|
| bool m_discardMarginAfter : 1;
|
| };
|
|
|