corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1379332: When computing abspos CB content-box size, don't bother subtracting borderpadding if CB is a 0-sized child of a XUL-collapsed frame. r=mats

Browse Source 
If border & padding were ignored for sizing the containing block (which can
happen, if the containing block is a chlid of a XUL-collapsed frame), then we
don't need to subtract border & padding when computing the frame's content-box
size for its abspos descendants.

MozReview-Commit-ID: JGnzShl8m67
This commit is contained in:
Daniel Holbert
2017-10-20 16:40:43 -07:00
parent a2561b4f25
commit 0b03ee5d91
4 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
layout/generic/ReflowInput.cpp
View File

@@ -1093,6 +1093,14 @@ ReflowInput::ApplyRelativePositioning(nsIFrame* aFrame,
}
}
// Returns true if aFrame is non-null, a XUL frame, and "XUL-collapsed" (which
// only becomes a valid question to ask if we know it's a XUL frame).
static bool
IsXULCollapsedXULFrame(nsIFrame* aFrame)
{
return aFrame && aFrame->IsXULBoxFrame() && aFrame->IsXULCollapsed();
}
nsIFrame*
ReflowInput::GetHypotheticalBoxContainer(nsIFrame* aFrame,
nscoord& aCBIStartEdge,
@@ -1128,9 +1136,23 @@ ReflowInput::GetHypotheticalBoxContainer(nsIFrame* aFrame,
NS_ASSERTION(!(aFrame->GetStateBits() & NS_FRAME_IN_REFLOW),
"aFrame shouldn't be in reflow; we'll lie if it is");
WritingMode wm = aFrame->GetWritingMode();
LogicalMargin borderPadding = aFrame->GetLogicalUsedBorderAndPadding(wm);
aCBIStartEdge = borderPadding.IStart(wm);
aCBSize = aFrame->GetLogicalSize(wm) - borderPadding.Size(wm);
// Compute CB's offset & content-box size by subtracting borderpadding from
// frame size. Exception: if the CB is 0-sized, it *might* be a child of a
// XUL-collapsed frame and might have nonzero borderpadding that was simply
// discarded during its layout. (See the child-zero-sizing in
// nsSprocketLayout::XULLayout()). In that case, we ignore the
// borderpadding here (just like we did when laying it out), or else we'd
// produce a bogus negative content-box size.
aCBIStartEdge = 0;
aCBSize = aFrame->GetLogicalSize(wm);
if (!aCBSize.IsAllZero() ||
(!IsXULCollapsedXULFrame(aFrame->GetParent()))) {
// aFrame is not XUL-collapsed (nor is it a child of a XUL-collapsed
// frame), so we can go ahead and subtract out border padding.
LogicalMargin borderPadding = aFrame->GetLogicalUsedBorderAndPadding(wm);
aCBIStartEdge += borderPadding.IStart(wm);
aCBSize -= borderPadding.Size(wm);
}
}
return aFrame;