| Index: Source/core/rendering/RenderBox.cpp
|
| diff --git a/Source/core/rendering/RenderBox.cpp b/Source/core/rendering/RenderBox.cpp
|
| index 1bb397c2e1aa055fe2e43a371ea1a868323d6e2e..ff1a87498943c4f9c85df2fc5a70e51306c20210 100644
|
| --- a/Source/core/rendering/RenderBox.cpp
|
| +++ b/Source/core/rendering/RenderBox.cpp
|
| @@ -1611,7 +1611,7 @@ void RenderBox::positionLineBox(InlineBox* box)
|
| // our object was inline originally, since otherwise it would have ended up underneath
|
| // the inlines.
|
| RootInlineBox& root = box->root();
|
| - root.block().setStaticInlinePositionForChild(this, LayoutUnit::fromFloatRound(box->logicalLeft()));
|
| + root.block().setStaticInlinePositionForChild(*this, LayoutUnit::fromFloatRound(box->logicalLeft()));
|
| if (style()->hasStaticInlinePosition(box->isHorizontal()))
|
| setChildNeedsLayout(MarkOnlyThis); // Just go ahead and mark the positioned object as needing layout, so it will update its position properly.
|
| } else {
|
| @@ -1891,7 +1891,7 @@ void RenderBox::computeLogicalWidth(LogicalExtentComputedValues& computedValues)
|
|
|
| if (!hasPerpendicularContainingBlock && containerLogicalWidth && containerLogicalWidth != (computedValues.m_extent + computedValues.m_margins.m_start + computedValues.m_margins.m_end)
|
| && !isFloating() && !isInline() && !cb->isFlexibleBoxIncludingDeprecated() && !cb->isRenderGrid()) {
|
| - LayoutUnit newMargin = containerLogicalWidth - computedValues.m_extent - cb->marginStartForChild(this);
|
| + LayoutUnit newMargin = containerLogicalWidth - computedValues.m_extent - cb->marginStartForChild(*this);
|
| bool hasInvertedDirection = cb->style()->isLeftToRightDirection() != style()->isLeftToRightDirection();
|
| if (hasInvertedDirection)
|
| computedValues.m_margins.m_start = newMargin;
|
| @@ -2590,8 +2590,8 @@ void RenderBox::computeAndSetBlockDirectionMargins(const RenderBlock* containing
|
| style()->marginAfterUsing(containingBlock->style()));
|
| // Note that in this 'positioning phase' of the layout we are using the containing block's writing mode rather than our own when calculating margins.
|
| // See http://www.w3.org/TR/2014/CR-css-writing-modes-3-20140320/#orthogonal-flows
|
| - containingBlock->setMarginBeforeForChild(this, marginBefore);
|
| - containingBlock->setMarginAfterForChild(this, marginAfter);
|
| + containingBlock->setMarginBeforeForChild(*this, marginBefore);
|
| + containingBlock->setMarginAfterForChild(*this, marginAfter);
|
| }
|
|
|
| LayoutUnit RenderBox::containingBlockLogicalWidthForPositioned(const RenderBoxModelObject* containingBlock, bool checkForPerpendicularWritingMode) const
|
|
|