author | Mats Palmgren <mats@mozilla.com> |
Wed, 11 Nov 2015 22:28:53 +0100 | |
changeset 272139 | 5e5a5420f0e14cd2a0c298b8970db228d7d2b503 |
parent 272138 | d12f758f5f362ffed1aa195d266289e1ed2a1123 |
child 272140 | 81e5c1bef9e33761f7502ee0befce953da367f2a |
push id | 67883 |
push user | mpalmgren@mozilla.com |
push date | Wed, 11 Nov 2015 21:29:08 +0000 |
treeherder | mozilla-inbound@81e5c1bef9e3 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | roc |
bugs | 1223232 |
milestone | 45.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/layout/generic/nsFrame.cpp +++ b/layout/generic/nsFrame.cpp @@ -4609,22 +4609,23 @@ nsFrame::ReflowAbsoluteFrames(nsPresCont { if (HasAbsolutelyPositionedChildren()) { nsAbsoluteContainingBlock* absoluteContainer = GetAbsoluteContainingBlock(); // Let the absolutely positioned container reflow any absolutely positioned // child frames that need to be reflowed // The containing block for the abs pos kids is formed by our padding edge. - nsMargin computedBorder = - aReflowState.ComputedPhysicalBorderPadding() - aReflowState.ComputedPhysicalPadding(); + nsMargin usedBorder = GetUsedBorder(); nscoord containingBlockWidth = - aDesiredSize.Width() - computedBorder.LeftRight(); + aDesiredSize.Width() - usedBorder.LeftRight(); + MOZ_ASSERT(containingBlockWidth >= 0); nscoord containingBlockHeight = - aDesiredSize.Height() - computedBorder.TopBottom(); + aDesiredSize.Height() - usedBorder.TopBottom(); + MOZ_ASSERT(containingBlockHeight >= 0); nsContainerFrame* container = do_QueryFrame(this); NS_ASSERTION(container, "Abs-pos children only supported on container frames for now"); nsRect containingBlock(0, 0, containingBlockWidth, containingBlockHeight); absoluteContainer->Reflow(container, aPresContext, aReflowState, aStatus, containingBlock, aConstrainBSize, true, true, // XXX could be optimized