| Index: Source/core/rendering/RenderBlockFlow.h
|
| diff --git a/Source/core/rendering/RenderBlockFlow.h b/Source/core/rendering/RenderBlockFlow.h
|
| index 3135a04dcd9ddd15d58bc80bb409a16001360ec4..f2a405127278571b4e3814b2b45b5b45b83898cf 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);
|
| + void layoutBlockFlow(bool relayoutChildren);
|
| void layoutBlockChildren(bool relayoutChildren, LayoutUnit& maxFloatLogicalBottom, SubtreeLayoutScope&, LayoutUnit beforeEdge, LayoutUnit afterEdge);
|
|
|
| void layoutBlockChild(RenderBox* child, MarginInfo&, LayoutUnit& previousFloatLogicalBottom, LayoutUnit& maxFloatLogicalBottom);
|
| @@ -293,7 +293,7 @@ private:
|
|
|
| LayoutUnit getClearDelta(RenderBox* child, LayoutUnit yPos);
|
|
|
| - bool hasOverhangingFloats() { return parent() && !hasColumns() && containsFloats() && lowestFloatLogicalBottom() > logicalHeight(); }
|
| + bool hasOverhangingFloats() { return parent() && containsFloats() && lowestFloatLogicalBottom() > logicalHeight(); }
|
| bool hasOverhangingFloat(RenderBox*);
|
| void addIntrudingFloats(RenderBlockFlow* prev, LayoutUnit xoffset, LayoutUnit yoffset);
|
| LayoutUnit addOverhangingFloats(RenderBlockFlow* child, bool makeChildPaintOtherFloats);
|
| @@ -323,7 +323,7 @@ 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&);
|
| + virtual bool relayoutForPagination(bool hasSpecifiedPageLogicalHeight, LayoutUnit pageLogicalHeight, LayoutStateMaintainer&) { return false; }
|
| public:
|
| struct FloatWithRect {
|
| FloatWithRect(RenderBox* f)
|
|
|