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

Bug 1467209 - Implement contain:size for HTMLButtonControlFrame. r=dholbert

Browse Source 
MozReview-Commit-ID: Jsjs3jxy4z3
This commit is contained in:
Morgan Rae Reschenberg
2018-06-29 10:27:55 -07:00
parent 8925ceae94
commit ccc9632ccd
4 changed files with 206 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
layout/forms/nsHTMLButtonControlFrame.cpp
View File

@@ -146,12 +146,14 @@ nsHTMLButtonControlFrame::GetMinISize(gfxContext* aRenderingContext)
{
nscoord result;
DISPLAY_MIN_WIDTH(this, result);
nsIFrame* kid = mFrames.FirstChild();
result = nsLayoutUtils::IntrinsicForContainer(aRenderingContext,
kid,
nsLayoutUtils::MIN_ISIZE);
if (StyleDisplay()->IsContainSize()) {
result = 0;
} else {
nsIFrame* kid = mFrames.FirstChild();
result = nsLayoutUtils::IntrinsicForContainer(aRenderingContext,
kid,
nsLayoutUtils::MIN_ISIZE);
}
return result;
}
@@ -160,12 +162,14 @@ nsHTMLButtonControlFrame::GetPrefISize(gfxContext* aRenderingContext)
{
nscoord result;
DISPLAY_PREF_WIDTH(this, result);
nsIFrame* kid = mFrames.FirstChild();
result = nsLayoutUtils::IntrinsicForContainer(aRenderingContext,
kid,
nsLayoutUtils::PREF_ISIZE);
if (StyleDisplay()->IsContainSize()) {
result = 0;
} else {
nsIFrame* kid = mFrames.FirstChild();
result = nsLayoutUtils::IntrinsicForContainer(aRenderingContext,
kid,
nsLayoutUtils::PREF_ISIZE);
}
return result;
}
@@ -261,6 +265,11 @@ nsHTMLButtonControlFrame::ReflowButtonContents(nsPresContext* aPresContext,
if (aButtonReflowInput.ComputedBSize() != NS_INTRINSICSIZE) {
// Button has a fixed block-size -- that's its content-box bSize.
buttonContentBox.BSize(wm) = aButtonReflowInput.ComputedBSize();
} else if (aButtonReflowInput.mStyleDisplay->IsContainSize()) {
// Button is intrinsically sized and has size containment.
// It should have a BSize that is either zero or the minimum
// specified BSize.
buttonContentBox.BSize(wm) = aButtonReflowInput.ComputedMinBSize();
} else {
// Button is intrinsically sized -- it should shrinkwrap the
// button-contents' bSize:
@@ -278,6 +287,8 @@ nsHTMLButtonControlFrame::ReflowButtonContents(nsPresContext* aPresContext,
}
if (aButtonReflowInput.ComputedISize() != NS_INTRINSICSIZE) {
buttonContentBox.ISize(wm) = aButtonReflowInput.ComputedISize();
} else if (aButtonReflowInput.mStyleDisplay->IsContainSize()) {
buttonContentBox.ISize(wm) = aButtonReflowInput.ComputedMinISize();
} else {
buttonContentBox.ISize(wm) = contentsDesiredSize.ISize(wm);
buttonContentBox.ISize(wm) =
@@ -322,7 +333,14 @@ nsHTMLButtonControlFrame::ReflowButtonContents(nsPresContext* aPresContext,
// within our frame... unless it's orthogonal, in which case we'll use the
// contents inline-size as an approximation for now.
// XXX is there a better strategy? should we include border-padding?
if (aButtonDesiredSize.GetWritingMode().IsOrthogonalTo(wm)) {
if (aButtonReflowInput.mStyleDisplay->IsContainSize()) {
// If we're size-contained, we should pretend our contents had 0 height
// (as they would, if we had no children). This case is identical to the
// final else case, but uses only our specified button height for ascent
// (ie. it ignores the height returned in contentsDesiredSize).
nscoord containAscent = (buttonContentBox.BSize(wm) / 2) + clbp.BStart(wm);
aButtonDesiredSize.SetBlockStartAscent(containAscent);
} else if (aButtonDesiredSize.GetWritingMode().IsOrthogonalTo(wm)) {
aButtonDesiredSize.SetBlockStartAscent(contentsDesiredSize.ISize(wm));
} else {
aButtonDesiredSize.SetBlockStartAscent(contentsDesiredSize.BlockStartAscent() +