diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp index a2117bdda86f..38b391d00832 100644 --- a/layout/generic/nsBlockFrame.cpp +++ b/layout/generic/nsBlockFrame.cpp @@ -3538,7 +3538,7 @@ void nsBlockFrame::ReflowBlockFrame(BlockReflowInput& aState, } // Construct the reflow input for the block. - Maybe blockReflowInput; + Maybe childReflowInput; Maybe cbSize; LogicalSize availSize = availSpace.Size(wm); if (Style()->GetPseudoType() == PseudoStyleType::columnContent) { @@ -3599,15 +3599,15 @@ void nsBlockFrame::ReflowBlockFrame(BlockReflowInput& aState, } } - blockReflowInput.emplace(aState.mPresContext, aState.mReflowInput, frame, + childReflowInput.emplace(aState.mPresContext, aState.mReflowInput, frame, availSize.ConvertTo(frame->GetWritingMode(), wm), cbSize); if (aLine->MovedFragments()) { // We only need to set this the first reflow, since if we reflow - // again (and replace blockReflowInput) we'll be reflowing it + // again (and replace childReflowInput) we'll be reflowing it // again in the same fragment as the previous time. - blockReflowInput->mFlags.mMovedBlockFragments = true; + childReflowInput->mFlags.mMovedBlockFragments = true; } nsFloatManager::SavedState floatManagerState; @@ -3633,16 +3633,16 @@ void nsBlockFrame::ReflowBlockFrame(BlockReflowInput& aState, } if (mayNeedRetry) { - blockReflowInput->mDiscoveredClearance = &clearanceFrame; + childReflowInput->mDiscoveredClearance = &clearanceFrame; } else if (!applyBStartMargin) { - blockReflowInput->mDiscoveredClearance = + childReflowInput->mDiscoveredClearance = aState.mReflowInput.mDiscoveredClearance; } frameReflowStatus.Reset(); brc.ReflowBlock(availSpace, applyBStartMargin, aState.mPrevBEndMargin, clearance, aState.IsAdjacentWithTop(), aLine.get(), - *blockReflowInput, frameReflowStatus, aState); + *childReflowInput, frameReflowStatus, aState); // Now the block has a height. Using that height, get the // available space again and call ComputeBlockAvailSpace again. @@ -3727,8 +3727,8 @@ void nsBlockFrame::ReflowBlockFrame(BlockReflowInput& aState, clearance = 0; } - blockReflowInput.reset(); - blockReflowInput.emplace( + childReflowInput.reset(); + childReflowInput.emplace( aState.mPresContext, aState.mReflowInput, frame, availSpace.Size(wm).ConvertTo(frame->GetWritingMode(), wm)); } while (true); @@ -3742,7 +3742,7 @@ void nsBlockFrame::ReflowBlockFrame(BlockReflowInput& aState, aState.mPrevChild = frame; - if (blockReflowInput->WillReflowAgainForClearance()) { + if (childReflowInput->WillReflowAgainForClearance()) { // If an ancestor of ours is going to reflow for clearance, we // need to avoid calling PlaceBlock, because it unsets dirty bits // on the child block (both itself, and through its call to @@ -3780,7 +3780,7 @@ void nsBlockFrame::ReflowBlockFrame(BlockReflowInput& aState, nsCollapsingMargin collapsedBEndMargin; nsOverflowAreas overflowAreas; *aKeepReflowGoing = - brc.PlaceBlock(*blockReflowInput, forceFit, aLine.get(), + brc.PlaceBlock(*childReflowInput, forceFit, aLine.get(), collapsedBEndMargin, overflowAreas, frameReflowStatus); if (!frameReflowStatus.IsFullyComplete() && ShouldAvoidBreakInside(aState.mReflowInput)) {