Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 3992

Browse Source 
chris k did the work.
r=buster


git-svn-id: svn://10.0.0.236/trunk@77060 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
buster%netscape.com 2000-08-24 05:03:18 +00:00
parent 5efb96a3b8
commit 0a65af6558
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/layout/html/table/src/nsTableRowFrame.cpp
View File

@ -124,7 +124,7 @@ nsTableRowFrame::nsTableRowFrame()
{
mBits.mMinRowSpan = 1;
mBits.mRowIndex = 0;
ResetTallestCell();
ResetTallestCell(0);
}
NS_IMETHODIMP
@ -409,9 +409,9 @@ nscoord nsTableRowFrame::GetTallestCell() const
}
void
nsTableRowFrame::ResetTallestCell()
nsTableRowFrame::ResetTallestCell(nscoord aRowStyleHeight)
{
mTallestCell = 0;
mTallestCell = (NS_UNCONSTRAINEDSIZE == aRowStyleHeight) ? 0 : aRowStyleHeight;
mMaxCellAscent = 0;
mMaxCellDescent = 0;
}
@ -462,7 +462,7 @@ nsTableRowFrame::CalcTallestCell()
if (NS_FAILED(rv)) return;
nscoord cellSpacingX = tableFrame->GetCellSpacingX();
ResetTallestCell();
ResetTallestCell(0);
for (nsIFrame* kidFrame = mFrames.FirstChild(); kidFrame; kidFrame->GetNextSibling(&kidFrame)) {
nsCOMPtr<nsIAtom> frameType;
@ -818,7 +818,7 @@ NS_METHOD nsTableRowFrame::ResizeReflow(nsIPresContext* aPresContext,
}
nsresult rv = NS_OK;
ResetTallestCell();
ResetTallestCell(aReflowState.reflowState.mComputedHeight);
nsSize localKidMaxElementSize(0,0);
nsSize* kidMaxElementSize = (aDesiredSize.maxElementSize) ? &localKidMaxElementSize : nsnull;
@ -1067,7 +1067,7 @@ nsTableRowFrame::InitialReflow(nsIPresContext* aPresContext,
PRBool aDoSiblings)
{
nsresult rv = NS_OK;
ResetTallestCell();
ResetTallestCell(aReflowState.reflowState.mComputedHeight);
// Place our children, one at a time, until we are out of children
nsSize kidMaxElementSize(0,0);

2
mozilla/layout/html/table/src/nsTableRowFrame.h
View File

@ -160,7 +160,7 @@ public:
nsTableFrame* aTableFrame = nsnull,
nsTableCellFrame* aCellFrame = nsnull);
void ResetTallestCell();
void ResetTallestCell(nscoord aRowStyleHeight);
// calculate the tallest child when the previous tallest child gets shorter
void CalcTallestCell();

12
mozilla/layout/tables/nsTableRowFrame.cpp
View File

@ -124,7 +124,7 @@ nsTableRowFrame::nsTableRowFrame()
{
mBits.mMinRowSpan = 1;
mBits.mRowIndex = 0;
ResetTallestCell();
ResetTallestCell(0);
}
NS_IMETHODIMP
@ -409,9 +409,9 @@ nscoord nsTableRowFrame::GetTallestCell() const
}
void
nsTableRowFrame::ResetTallestCell()
nsTableRowFrame::ResetTallestCell(nscoord aRowStyleHeight)
{
mTallestCell = 0;
mTallestCell = (NS_UNCONSTRAINEDSIZE == aRowStyleHeight) ? 0 : aRowStyleHeight;
mMaxCellAscent = 0;
mMaxCellDescent = 0;
}
@ -462,7 +462,7 @@ nsTableRowFrame::CalcTallestCell()
if (NS_FAILED(rv)) return;
nscoord cellSpacingX = tableFrame->GetCellSpacingX();
ResetTallestCell();
ResetTallestCell(0);
for (nsIFrame* kidFrame = mFrames.FirstChild(); kidFrame; kidFrame->GetNextSibling(&kidFrame)) {
nsCOMPtr<nsIAtom> frameType;
@ -818,7 +818,7 @@ NS_METHOD nsTableRowFrame::ResizeReflow(nsIPresContext* aPresContext,
}
nsresult rv = NS_OK;
ResetTallestCell();
ResetTallestCell(aReflowState.reflowState.mComputedHeight);
nsSize localKidMaxElementSize(0,0);
nsSize* kidMaxElementSize = (aDesiredSize.maxElementSize) ? &localKidMaxElementSize : nsnull;
@ -1067,7 +1067,7 @@ nsTableRowFrame::InitialReflow(nsIPresContext* aPresContext,
PRBool aDoSiblings)
{
nsresult rv = NS_OK;
ResetTallestCell();
ResetTallestCell(aReflowState.reflowState.mComputedHeight);
// Place our children, one at a time, until we are out of children
nsSize kidMaxElementSize(0,0);

2
mozilla/layout/tables/nsTableRowFrame.h
View File

@ -160,7 +160,7 @@ public:
nsTableFrame* aTableFrame = nsnull,
nsTableCellFrame* aCellFrame = nsnull);
void ResetTallestCell();
void ResetTallestCell(nscoord aRowStyleHeight);
// calculate the tallest child when the previous tallest child gets shorter
void CalcTallestCell();