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

Replace Get/SetTopAscent with Get/SetBlockStartAscent. Bug 789096, r=jfkthame

Browse Source
This commit is contained in:
Simon Montagu
2014-06-11 02:45:31 -07:00
parent 42e0900d15
commit 7182a1b8b9
28 changed files with 250 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
layout/forms/nsHTMLButtonControlFrame.cpp
View File

@@ -331,8 +331,9 @@ nsHTMLButtonControlFrame::ReflowButtonContents(nsPresContext* aPresContext,
xoffset, yoffset, 0);
// Make sure we have a useful 'ascent' value for the child
if (contentsDesiredSize.TopAscent() == nsHTMLReflowMetrics::ASK_FOR_BASELINE) {
contentsDesiredSize.SetTopAscent(aFirstKid->GetBaseline());
if (contentsDesiredSize.BlockStartAscent() ==
nsHTMLReflowMetrics::ASK_FOR_BASELINE) {
contentsDesiredSize.SetBlockStartAscent(aFirstKid->GetBaseline());
}
// OK, we're done with the child frame.
@@ -346,7 +347,8 @@ nsHTMLButtonControlFrame::ReflowButtonContents(nsPresContext* aPresContext,
// * Button's ascent is its child's ascent, plus the child's y-offset
// within our frame:
aButtonDesiredSize.SetTopAscent(contentsDesiredSize.TopAscent() + yoffset);
aButtonDesiredSize.SetBlockStartAscent(contentsDesiredSize.BlockStartAscent() +
yoffset);
aButtonDesiredSize.SetOverflowAreasToDesiredBounds();
}