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

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

Browse Source
This commit is contained in:
pierre@netscape.com
1999-03-23 20:35:38 +00:00
parent 1a7ce84af7
commit 21181d751b
6 changed files with 18 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
layout/generic/nsBlockFrame.cpp
View File

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

10
layout/generic/nsBlockReflowState.cpp
View File

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

10
layout/generic/nsBlockReflowState.h
View File

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

10
layout/html/base/src/nsBlockFrame.cpp
View File

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

10
layout/html/base/src/nsBlockReflowState.cpp
View File

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

10
layout/html/base/src/nsBlockReflowState.h
View File

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