Index: Source/core/rendering/RenderBlockFlow.h |
diff --git a/Source/core/rendering/RenderBlockFlow.h b/Source/core/rendering/RenderBlockFlow.h |
index 19a2988e65a89ba81979d14bffaa96b421432b22..3a9fc7273d0abf254e46021b45d6b4fbc700693d 100644 |
--- a/Source/core/rendering/RenderBlockFlow.h |
+++ b/Source/core/rendering/RenderBlockFlow.h |
@@ -256,7 +256,7 @@ protected: |
virtual void insertedIntoTree() OVERRIDE; |
virtual void willBeDestroyed() OVERRIDE; |
private: |
- void layoutBlockFlow(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0); |
+ bool tryLayoutBlockFlow(bool relayoutChildren, LayoutUnit& pageLogicalHeight, SubtreeLayoutScope&); |
void layoutBlockChildren(bool relayoutChildren, LayoutUnit& maxFloatLogicalBottom, SubtreeLayoutScope&, LayoutUnit beforeEdge, LayoutUnit afterEdge); |
void layoutBlockChild(RenderBox* child, MarginInfo&, LayoutUnit& previousFloatLogicalBottom, LayoutUnit& maxFloatLogicalBottom); |
@@ -323,7 +323,9 @@ private: |
virtual RootInlineBox* createRootInlineBox(); // Subclassed by SVG |
void updateLogicalWidthForAlignment(const ETextAlign&, const RootInlineBox*, BidiRun* trailingSpaceRun, float& logicalLeft, float& totalLogicalWidth, float& availableLogicalWidth, int expansionOpportunityCount); |
- virtual bool relayoutForPagination(bool hasSpecifiedPageLogicalHeight, LayoutUnit pageLogicalHeight, LayoutStateMaintainer&); |
+ bool shouldRelayoutForPagination(LayoutUnit& pageLogicalHeight, LayoutUnit layoutOverflowLogicalBottom) const; |
+ void setColumnCountAndHeight(unsigned count, LayoutUnit pageLogicalHeight); |
+ |
public: |
struct FloatWithRect { |
FloatWithRect(RenderBox* f) |