| Index: Source/core/rendering/RenderBox.cpp
|
| diff --git a/Source/core/rendering/RenderBox.cpp b/Source/core/rendering/RenderBox.cpp
|
| index 1931eab5e6db5287c48500eb38c70f4011c633be..dd31d0080f92946750287476af55a052480dd231 100644
|
| --- a/Source/core/rendering/RenderBox.cpp
|
| +++ b/Source/core/rendering/RenderBox.cpp
|
| @@ -1892,7 +1892,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;
|
| @@ -2593,8 +2593,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
|
|
|