зеркало из https://github.com/mozilla/pjs.git
Backed out my previous changes because of performance degradation in deeply nested tables. Will increase the stack size in Mac applications instead.
This commit is contained in:
Родитель
13907929fa
Коммит
d9a2c1dc1e
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче