Backed out my previous changes because of performance degradation in deeply nested tables. Will increase the stack size in Mac applications instead.

git-svn-id: svn://10.0.0.236/trunk@24869 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pierre%netscape.com 1999-03-23 20:35:38 +00:00
parent 50d29a4ef6
commit b99fe92e31
6 changed files with 18 additions and 42 deletions

View File

@ -900,14 +900,11 @@ nsBlockFrame::Reflow(nsIPresContext& aPresContext,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus)
{
nsLineLayout* lineLayout = new nsLineLayout(aPresContext, aReflowState.spaceManager,
nsLineLayout lineLayout(aPresContext, aReflowState.spaceManager,
&aReflowState, nsnull != aMetrics.maxElementSize);
if (! lineLayout) {
return NS_ERROR_OUT_OF_MEMORY;
}
nsBlockReflowState state(aReflowState, aPresContext, this, aMetrics,
lineLayout);
lineLayout->Init(&state);
&lineLayout);
lineLayout.Init(&state);
if (NS_BLOCK_MARGIN_ROOT & mFlags) {
state.mIsMarginRoot = PR_TRUE;
}
@ -991,7 +988,6 @@ nsBlockFrame::Reflow(nsIPresContext& aPresContext,
aMetrics.width, aMetrics.height,
aMetrics.mCarriedOutTopMargin, aMetrics.mCarriedOutBottomMargin);
#endif
delete lineLayout;
return rv;
}

View File

@ -900,14 +900,11 @@ nsBlockFrame::Reflow(nsIPresContext& aPresContext,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus)
{
nsLineLayout* lineLayout = new nsLineLayout(aPresContext, aReflowState.spaceManager,
nsLineLayout lineLayout(aPresContext, aReflowState.spaceManager,
&aReflowState, nsnull != aMetrics.maxElementSize);
if (! lineLayout) {
return NS_ERROR_OUT_OF_MEMORY;
}
nsBlockReflowState state(aReflowState, aPresContext, this, aMetrics,
lineLayout);
lineLayout->Init(&state);
&lineLayout);
lineLayout.Init(&state);
if (NS_BLOCK_MARGIN_ROOT & mFlags) {
state.mIsMarginRoot = PR_TRUE;
}
@ -991,7 +988,6 @@ nsBlockFrame::Reflow(nsIPresContext& aPresContext,
aMetrics.width, aMetrics.height,
aMetrics.mCarriedOutTopMargin, aMetrics.mCarriedOutBottomMargin);
#endif
delete lineLayout;
return rv;
}

View File

@ -900,14 +900,11 @@ nsBlockFrame::Reflow(nsIPresContext& aPresContext,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus)
{
nsLineLayout* lineLayout = new nsLineLayout(aPresContext, aReflowState.spaceManager,
nsLineLayout lineLayout(aPresContext, aReflowState.spaceManager,
&aReflowState, nsnull != aMetrics.maxElementSize);
if (! lineLayout) {
return NS_ERROR_OUT_OF_MEMORY;
}
nsBlockReflowState state(aReflowState, aPresContext, this, aMetrics,
lineLayout);
lineLayout->Init(&state);
&lineLayout);
lineLayout.Init(&state);
if (NS_BLOCK_MARGIN_ROOT & mFlags) {
state.mIsMarginRoot = PR_TRUE;
}
@ -991,7 +988,6 @@ nsBlockFrame::Reflow(nsIPresContext& aPresContext,
aMetrics.width, aMetrics.height,
aMetrics.mCarriedOutTopMargin, aMetrics.mCarriedOutBottomMargin);
#endif
delete lineLayout;
return rv;
}

View File

@ -900,14 +900,11 @@ nsBlockFrame::Reflow(nsIPresContext& aPresContext,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus)
{
nsLineLayout* lineLayout = new nsLineLayout(aPresContext, aReflowState.spaceManager,
nsLineLayout lineLayout(aPresContext, aReflowState.spaceManager,
&aReflowState, nsnull != aMetrics.maxElementSize);
if (! lineLayout) {
return NS_ERROR_OUT_OF_MEMORY;
}
nsBlockReflowState state(aReflowState, aPresContext, this, aMetrics,
lineLayout);
lineLayout->Init(&state);
&lineLayout);
lineLayout.Init(&state);
if (NS_BLOCK_MARGIN_ROOT & mFlags) {
state.mIsMarginRoot = PR_TRUE;
}
@ -991,7 +988,6 @@ nsBlockFrame::Reflow(nsIPresContext& aPresContext,
aMetrics.width, aMetrics.height,
aMetrics.mCarriedOutTopMargin, aMetrics.mCarriedOutBottomMargin);
#endif
delete lineLayout;
return rv;
}

View File

@ -900,14 +900,11 @@ nsBlockFrame::Reflow(nsIPresContext& aPresContext,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus)
{
nsLineLayout* lineLayout = new nsLineLayout(aPresContext, aReflowState.spaceManager,
nsLineLayout lineLayout(aPresContext, aReflowState.spaceManager,
&aReflowState, nsnull != aMetrics.maxElementSize);
if (! lineLayout) {
return NS_ERROR_OUT_OF_MEMORY;
}
nsBlockReflowState state(aReflowState, aPresContext, this, aMetrics,
lineLayout);
lineLayout->Init(&state);
&lineLayout);
lineLayout.Init(&state);
if (NS_BLOCK_MARGIN_ROOT & mFlags) {
state.mIsMarginRoot = PR_TRUE;
}
@ -991,7 +988,6 @@ nsBlockFrame::Reflow(nsIPresContext& aPresContext,
aMetrics.width, aMetrics.height,
aMetrics.mCarriedOutTopMargin, aMetrics.mCarriedOutBottomMargin);
#endif
delete lineLayout;
return rv;
}

View File

@ -900,14 +900,11 @@ nsBlockFrame::Reflow(nsIPresContext& aPresContext,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus)
{
nsLineLayout* lineLayout = new nsLineLayout(aPresContext, aReflowState.spaceManager,
nsLineLayout lineLayout(aPresContext, aReflowState.spaceManager,
&aReflowState, nsnull != aMetrics.maxElementSize);
if (! lineLayout) {
return NS_ERROR_OUT_OF_MEMORY;
}
nsBlockReflowState state(aReflowState, aPresContext, this, aMetrics,
lineLayout);
lineLayout->Init(&state);
&lineLayout);
lineLayout.Init(&state);
if (NS_BLOCK_MARGIN_ROOT & mFlags) {
state.mIsMarginRoot = PR_TRUE;
}
@ -991,7 +988,6 @@ nsBlockFrame::Reflow(nsIPresContext& aPresContext,
aMetrics.width, aMetrics.height,
aMetrics.mCarriedOutTopMargin, aMetrics.mCarriedOutBottomMargin);
#endif
delete lineLayout;
return rv;
}