| Index: Source/core/layout/LayoutBlockFlow.h
|
| diff --git a/Source/core/layout/LayoutBlockFlow.h b/Source/core/layout/LayoutBlockFlow.h
|
| index 4622eb7f1f888c253d0a23d5093df953eb4d4286..f249e016c22a25f108ef7d204374da3cbceb0237 100644
|
| --- a/Source/core/layout/LayoutBlockFlow.h
|
| +++ b/Source/core/layout/LayoutBlockFlow.h
|
| @@ -288,6 +288,8 @@ private:
|
| bool layoutBlockFlow(bool relayoutChildren, LayoutUnit& pageLogicalHeight, SubtreeLayoutScope&);
|
| void layoutBlockChildren(bool relayoutChildren, SubtreeLayoutScope&, LayoutUnit beforeEdge, LayoutUnit afterEdge);
|
|
|
| + void markDescendantsWithFloatsForLayoutIfNeeded(LayoutBlockFlow& child, LayoutUnit newLogicalTop, LayoutUnit previousFloatLogicalBottom);
|
| + bool positionAndLayoutOnceIfNeeded(LayoutBox& child, LayoutUnit newLogicalTop, LayoutUnit& previousFloatLogicalBottom);
|
| void layoutBlockChild(LayoutBox& child, MarginInfo&, LayoutUnit& previousFloatLogicalBottom);
|
| void adjustPositionedBlock(LayoutBox& child, const MarginInfo&);
|
| void adjustFloatingBlock(const MarginInfo&);
|
| @@ -487,7 +489,7 @@ private:
|
| LayoutUnit applyBeforeBreak(LayoutBox& child, LayoutUnit logicalOffset); // If the child has a before break, then return a new yPos that shifts to the top of the next page/column.
|
| LayoutUnit applyAfterBreak(LayoutBox& child, LayoutUnit logicalOffset, MarginInfo&); // If the child has an after break, then return a new offset that shifts to the top of the next page/column.
|
|
|
| - LayoutUnit adjustBlockChildForPagination(LayoutUnit logicalTopAfterClear, LayoutUnit estimateWithoutPagination, LayoutBox& child, bool atBeforeSideOfBlock);
|
| + LayoutUnit adjustBlockChildForPagination(LayoutUnit logicalTop, LayoutBox& child, bool atBeforeSideOfBlock);
|
| // Computes a deltaOffset value that put a line at the top of the next page if it doesn't fit on the current page.
|
| void adjustLinePositionForPagination(RootInlineBox&, LayoutUnit& deltaOffset);
|
| // If the child is unsplittable and can't fit on the current page, return the top of the next page/column.
|
|
|