Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-05 20:15:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleanup of unsigned int arithmethic + callqueryinterface, initial patch by tenthumbs@cybernex.net bug 157153 r=karnaze sr=roc+moz

Browse Source
This commit is contained in:
bernd.mielke%snafu.de 2002-12-13 15:21:38 +00:00
parent 9906757830
commit 206c7acdf6
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
layout/html/table/src/nsTableRowGroupFrame.cpp
View File

@ -817,7 +817,8 @@ nsTableRowGroupFrame::CalculateRowHeights(nsIPresContext* aPresContext,
for (rowFrame = startRowFrame, rowIndex = 0; rowFrame && (extra > 0); rowFrame = rowFrame->GetNextRow(), rowIndex++) {
RowInfo& rInfo = rowInfo[rowIndex];
if (rInfo.hasPctHeight) {
nscoord rowExtra = PR_MAX(0, rInfo.pctHeight - rInfo.height);
nscoord rowExtra = (rInfo.pctHeight > rInfo.height)
? rInfo.pctHeight - rInfo.height: 0;
rowExtra = PR_MIN(rowExtra, extra);
UpdateHeights(rInfo, rowExtra, heightOfRows, heightOfUnStyledRows);
extra -= rowExtra;
@ -1283,6 +1284,7 @@ nsTableRowGroupFrame::SplitRowGroup(nsIPresContext* aPresContext,
}
isTopOfPage = PR_FALSE; // after the 1st row, we can't be on top of the page any more.
}
return NS_OK;
}
/** Layout the entire row group.
@ -2117,11 +2119,10 @@ nsTableRowGroupFrame::GetNextSiblingOnLine(nsIFrame*& aFrame,
NS_ENSURE_ARG_POINTER(aFrame);
nsITableCellLayout* cellFrame;
nsresult result = aFrame->QueryInterface(NS_GET_IID(nsITableCellLayout),(void**)&cellFrame);
if(NS_FAILED(result) || !cellFrame)
return result?result:NS_ERROR_FAILURE;
nsresult result = CallQueryInterface(aFrame, &cellFrame);
if(NS_FAILED(result))
return result;
nsTableFrame* parentFrame = nsnull;
result = nsTableFrame::GetTableFrame(this, parentFrame);
nsTableCellMap* cellMap = parentFrame->GetCellMap();

13
layout/tables/nsTableRowGroupFrame.cpp
View File

@ -817,7 +817,8 @@ nsTableRowGroupFrame::CalculateRowHeights(nsIPresContext* aPresContext,
for (rowFrame = startRowFrame, rowIndex = 0; rowFrame && (extra > 0); rowFrame = rowFrame->GetNextRow(), rowIndex++) {
RowInfo& rInfo = rowInfo[rowIndex];
if (rInfo.hasPctHeight) {
nscoord rowExtra = PR_MAX(0, rInfo.pctHeight - rInfo.height);
nscoord rowExtra = (rInfo.pctHeight > rInfo.height)
? rInfo.pctHeight - rInfo.height: 0;
rowExtra = PR_MIN(rowExtra, extra);
UpdateHeights(rInfo, rowExtra, heightOfRows, heightOfUnStyledRows);
extra -= rowExtra;
@ -1283,6 +1284,7 @@ nsTableRowGroupFrame::SplitRowGroup(nsIPresContext* aPresContext,
}
isTopOfPage = PR_FALSE; // after the 1st row, we can't be on top of the page any more.
}
return NS_OK;
}
/** Layout the entire row group.
@ -2117,11 +2119,10 @@ nsTableRowGroupFrame::GetNextSiblingOnLine(nsIFrame*& aFrame,
NS_ENSURE_ARG_POINTER(aFrame);
nsITableCellLayout* cellFrame;
nsresult result = aFrame->QueryInterface(NS_GET_IID(nsITableCellLayout),(void**)&cellFrame);
if(NS_FAILED(result) || !cellFrame)
return result?result:NS_ERROR_FAILURE;
nsresult result = CallQueryInterface(aFrame, &cellFrame);
if(NS_FAILED(result))
return result;
nsTableFrame* parentFrame = nsnull;
result = nsTableFrame::GetTableFrame(this, parentFrame);
nsTableCellMap* cellMap = parentFrame->GetCellMap();