| Index: Source/core/rendering/RenderBlockFlow.h
|
| diff --git a/Source/core/rendering/RenderBlockFlow.h b/Source/core/rendering/RenderBlockFlow.h
|
| index 7cbec609fba1d7c02fee821b6cf1d40671af93ba..43ad4c3606152e2f1f19d632f624d558a64dd7d9 100644
|
| --- a/Source/core/rendering/RenderBlockFlow.h
|
| +++ b/Source/core/rendering/RenderBlockFlow.h
|
| @@ -161,8 +161,8 @@ public:
|
|
|
| LayoutUnit startAlignedOffsetForLine(LayoutUnit position, bool shouldIndentText);
|
|
|
| - void setStaticInlinePositionForChild(RenderBox*, LayoutUnit inlinePosition);
|
| - void updateStaticInlinePositionForChild(RenderBox*, LayoutUnit logicalTop);
|
| + void setStaticInlinePositionForChild(RenderBox&, LayoutUnit inlinePosition);
|
| + void updateStaticInlinePositionForChild(RenderBox&, LayoutUnit logicalTop);
|
|
|
| static bool shouldSkipCreatingRunsForObject(RenderObject* obj)
|
| {
|
| @@ -212,13 +212,13 @@ public:
|
| if (isHorizontalWritingMode())
|
| return child->x() + child->renderer()->marginLeft();
|
|
|
| - return child->x() + marginBeforeForChild(child->renderer());
|
| + return child->x() + marginBeforeForChild(*(child->renderer()));
|
| }
|
|
|
| LayoutUnit yPositionForFloatIncludingMargin(const FloatingObject* child) const
|
| {
|
| if (isHorizontalWritingMode())
|
| - return child->y() + marginBeforeForChild(child->renderer());
|
| + return child->y() + marginBeforeForChild(*(child->renderer()));
|
|
|
| return child->y() + child->renderer()->marginTop();
|
| }
|
| @@ -248,21 +248,21 @@ protected:
|
| virtual RenderObject* layoutSpecialExcludedChild(bool /*relayoutChildren*/, SubtreeLayoutScope&);
|
| virtual bool updateLogicalWidthAndColumnWidth() override;
|
|
|
| - void setLogicalLeftForChild(RenderBox* child, LayoutUnit logicalLeft);
|
| - void setLogicalTopForChild(RenderBox* child, LayoutUnit logicalTop);
|
| - void determineLogicalLeftPositionForChild(RenderBox* child);
|
| + void setLogicalLeftForChild(RenderBox& child, LayoutUnit logicalLeft);
|
| + void setLogicalTopForChild(RenderBox& child, LayoutUnit logicalTop);
|
| + void determineLogicalLeftPositionForChild(RenderBox& child);
|
|
|
| private:
|
| bool layoutBlockFlow(bool relayoutChildren, LayoutUnit& pageLogicalHeight, SubtreeLayoutScope&);
|
| void layoutBlockChildren(bool relayoutChildren, SubtreeLayoutScope&, LayoutUnit beforeEdge, LayoutUnit afterEdge);
|
|
|
| - void layoutBlockChild(RenderBox* child, MarginInfo&, LayoutUnit& previousFloatLogicalBottom);
|
| - void adjustPositionedBlock(RenderBox* child, const MarginInfo&);
|
| + void layoutBlockChild(RenderBox& child, MarginInfo&, LayoutUnit& previousFloatLogicalBottom);
|
| + void adjustPositionedBlock(RenderBox& child, const MarginInfo&);
|
| void adjustFloatingBlock(const MarginInfo&);
|
|
|
| LayoutPoint computeLogicalLocationForFloat(const FloatingObject*, LayoutUnit logicalTopOffset) const;
|
|
|
| - FloatingObject* insertFloatingObject(RenderBox*);
|
| + FloatingObject* insertFloatingObject(RenderBox&);
|
| void removeFloatingObject(RenderBox*);
|
| void removeFloatingObjectsBelow(FloatingObject*, int logicalOffset);
|
|
|
| @@ -365,7 +365,7 @@ public:
|
| LayoutUnit m_positiveMarginAfter;
|
| LayoutUnit m_negativeMarginAfter;
|
| };
|
| - MarginValues marginValuesForChild(RenderBox* child) const;
|
| + MarginValues marginValuesForChild(RenderBox& child) const;
|
|
|
| // Allocated only when some of these fields have non-default values
|
| struct RenderBlockFlowRareData : public NoBaseWillBeGarbageCollected<RenderBlockFlowRareData> {
|
| @@ -430,11 +430,11 @@ protected:
|
| bool mustDiscardMarginBefore() const;
|
| bool mustDiscardMarginAfter() const;
|
|
|
| - bool mustDiscardMarginBeforeForChild(const RenderBox*) const;
|
| - bool mustDiscardMarginAfterForChild(const RenderBox*) const;
|
| + bool mustDiscardMarginBeforeForChild(const RenderBox&) const;
|
| + bool mustDiscardMarginAfterForChild(const RenderBox&) const;
|
|
|
| - bool mustSeparateMarginBeforeForChild(const RenderBox*) const;
|
| - bool mustSeparateMarginAfterForChild(const RenderBox*) const;
|
| + bool mustSeparateMarginBeforeForChild(const RenderBox&) const;
|
| + bool mustSeparateMarginAfterForChild(const RenderBox&) const;
|
|
|
| void initMaxMarginValues()
|
| {
|
| @@ -452,21 +452,21 @@ private:
|
| virtual LayoutUnit collapsedMarginBefore() const override final { return maxPositiveMarginBefore() - maxNegativeMarginBefore(); }
|
| virtual LayoutUnit collapsedMarginAfter() const override final { return maxPositiveMarginAfter() - maxNegativeMarginAfter(); }
|
|
|
| - LayoutUnit collapseMargins(RenderBox* child, MarginInfo&, bool childIsSelfCollapsing);
|
| - LayoutUnit clearFloatsIfNeeded(RenderBox* child, MarginInfo&, LayoutUnit oldTopPosMargin, LayoutUnit oldTopNegMargin, LayoutUnit yPos, bool childIsSelfCollapsing);
|
| - LayoutUnit estimateLogicalTopPosition(RenderBox* child, const MarginInfo&, LayoutUnit& estimateWithoutPagination);
|
| - void marginBeforeEstimateForChild(RenderBox*, LayoutUnit&, LayoutUnit&, bool&) const;
|
| + LayoutUnit collapseMargins(RenderBox& child, MarginInfo&, bool childIsSelfCollapsing);
|
| + LayoutUnit clearFloatsIfNeeded(RenderBox& child, MarginInfo&, LayoutUnit oldTopPosMargin, LayoutUnit oldTopNegMargin, LayoutUnit yPos, bool childIsSelfCollapsing);
|
| + LayoutUnit estimateLogicalTopPosition(RenderBox& child, const MarginInfo&, LayoutUnit& estimateWithoutPagination);
|
| + void marginBeforeEstimateForChild(RenderBox&, LayoutUnit&, LayoutUnit&, bool&) const;
|
| void handleAfterSideOfBlock(RenderBox* lastChild, LayoutUnit top, LayoutUnit bottom, MarginInfo&);
|
| void setCollapsedBottomMargin(const MarginInfo&);
|
|
|
| - LayoutUnit applyBeforeBreak(RenderBox* 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(RenderBox* 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 applyBeforeBreak(RenderBox& 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(RenderBox& 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, RenderBox* child, bool atBeforeSideOfBlock);
|
| + LayoutUnit adjustBlockChildForPagination(LayoutUnit logicalTopAfterClear, LayoutUnit estimateWithoutPagination, RenderBox& 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, RenderFlowThread*);
|
| + void adjustLinePositionForPagination(RootInlineBox&, LayoutUnit& deltaOffset, RenderFlowThread*);
|
| // If the child is unsplittable and can't fit on the current page, return the top of the next page/column.
|
| - LayoutUnit adjustForUnsplittableChild(RenderBox*, LayoutUnit logicalOffset, bool includeMargins = false);
|
| + LayoutUnit adjustForUnsplittableChild(RenderBox&, LayoutUnit logicalOffset, bool includeMargins = false);
|
|
|
| // Used to store state between styleWillChange and styleDidChange
|
| static bool s_canPropagateFloatIntoSibling;
|
|
|