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

Bug 1176354 - Rename nsTableRowFrame::GetBSize to differentiate better from nsIFrame::BSize. r=dholbert

Browse Source
This commit is contained in:
Jonathan Kew
2015-06-23 13:41:31 -07:00
parent 797a0a8648
commit cd6c65dc69
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
layout/tables/nsTableRowFrame.cpp
View File

@@ -412,7 +412,7 @@ nscoord nsTableRowFrame::GetRowBaseline(WritingMode aWM)
}
nscoord
nsTableRowFrame::GetBSize(nscoord aPctBasis) const
nsTableRowFrame::GetInitialBSize(nscoord aPctBasis) const
{
nscoord bsize = 0;
if ((aPctBasis > 0) && HasPctBSize()) {
@@ -455,7 +455,7 @@ nsTableRowFrame::UpdateBSize(nscoord aBSize,
if (aBSize != NS_UNCONSTRAINEDSIZE) {
if (!(aCellFrame->HasVerticalAlignBaseline())) { // only the cell's height matters
if (GetBSize() < aBSize) {
if (GetInitialBSize() < aBSize) {
int32_t rowSpan = aTableFrame->GetEffectiveRowSpan(*aCellFrame);
if (rowSpan == 1) {
SetContentBSize(aBSize);
@@ -477,7 +477,7 @@ nsTableRowFrame::UpdateBSize(nscoord aBSize,
}
}
// keep the tallest bsize in sync
if (GetBSize() < mMaxCellAscent + mMaxCellDescent) {
if (GetInitialBSize() < mMaxCellAscent + mMaxCellDescent) {
SetContentBSize(mMaxCellAscent + mMaxCellDescent);
}
}
@@ -522,7 +522,7 @@ nsTableRowFrame::CalcBSize(const nsHTMLReflowState& aReflowState)
UpdateBSize(desSize.BSize(wm), ascent, descent, tableFrame, cellFrame);
}
}
return GetBSize();
return GetInitialBSize();
}
/**