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

pass2 reflow doesn't request max element sizes to help with bug 14855. Reviewers didn't respond.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@50782 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
karnaze%netscape.com 1999-10-15 04:09:22 +00:00
parent 7c13a9f3b1
commit ef61c5a72c
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/layout/html/table/src/nsTableFrame.cpp
View File

@ -2238,6 +2238,7 @@ NS_METHOD nsTableFrame::Reflow(nsIPresContext& aPresContext,
}
nsresult rv = NS_OK;
nsSize* pass1MaxElementSize = aDesiredSize.maxElementSize;
if (eReflowReason_Incremental == aReflowState.reason) {
rv = IncrementalReflow(aPresContext, aDesiredSize, aReflowState, aStatus);
@ -2310,6 +2311,10 @@ NS_METHOD nsTableFrame::Reflow(nsIPresContext& aPresContext,
pass1Width = table->mRect.width;
}
reflowState.availableWidth = pass1Width;
if (pass1MaxElementSize) {
// we already have the max element size, so don't request it during pass2
aDesiredSize.maxElementSize = nsnull;
}
rv = ResizeReflowPass2(aPresContext, aDesiredSize, reflowState, aStatus);
if (NS_FAILED(rv)) {
return rv;
@ -2335,6 +2340,9 @@ NS_METHOD nsTableFrame::Reflow(nsIPresContext& aPresContext,
}
SetColumnDimensions(aDesiredSize.height);
if (pass1MaxElementSize) {
aDesiredSize.maxElementSize = pass1MaxElementSize;
}
if (nsDebugTable::gRflTable) nsTableFrame::DebugReflow("T::Rfl ex", this, nsnull, &aDesiredSize);
return rv;

8
mozilla/layout/tables/nsTableFrame.cpp
View File

@ -2238,6 +2238,7 @@ NS_METHOD nsTableFrame::Reflow(nsIPresContext& aPresContext,
}
nsresult rv = NS_OK;
nsSize* pass1MaxElementSize = aDesiredSize.maxElementSize;
if (eReflowReason_Incremental == aReflowState.reason) {
rv = IncrementalReflow(aPresContext, aDesiredSize, aReflowState, aStatus);
@ -2310,6 +2311,10 @@ NS_METHOD nsTableFrame::Reflow(nsIPresContext& aPresContext,
pass1Width = table->mRect.width;
}
reflowState.availableWidth = pass1Width;
if (pass1MaxElementSize) {
// we already have the max element size, so don't request it during pass2
aDesiredSize.maxElementSize = nsnull;
}
rv = ResizeReflowPass2(aPresContext, aDesiredSize, reflowState, aStatus);
if (NS_FAILED(rv)) {
return rv;
@ -2335,6 +2340,9 @@ NS_METHOD nsTableFrame::Reflow(nsIPresContext& aPresContext,
}
SetColumnDimensions(aDesiredSize.height);
if (pass1MaxElementSize) {
aDesiredSize.maxElementSize = pass1MaxElementSize;
}
if (nsDebugTable::gRflTable) nsTableFrame::DebugReflow("T::Rfl ex", this, nsnull, &aDesiredSize);
return rv;