Bug 47843. Be sure to set nsPresShell's mIsReflowing during initial reflow to avoid re-entrancy. r=nisheeth

This commit is contained in:
waterson%netscape.com 2000-08-21 20:10:07 +00:00
Родитель 18196c4b73
Коммит 51b6b8b62c
2 изменённых файлов: 8 добавлений и 0 удалений

Просмотреть файл

@ -1749,6 +1749,8 @@ PresShell::InitialReflow(nscoord aWidth, nscoord aHeight)
nsresult rv=CreateRenderingContext(rootFrame, &rcx);
if (NS_FAILED(rv)) return rv;
mIsReflowing = PR_TRUE;
nsHTMLReflowState reflowState(mPresContext, rootFrame,
eReflowReason_Initial, rcx, maxSize);
nsIView* view;
@ -1782,6 +1784,8 @@ PresShell::InitialReflow(nscoord aWidth, nscoord aHeight)
NS_FRAME_LOG(NS_FRAME_TRACE_CALLS, ("exit nsPresShell::InitialReflow"));
MOZ_TIMER_DEBUGLOG(("Stop: Reflow: PresShell::InitialReflow(), this=%p\n", this));
MOZ_TIMER_STOP(mReflowWatch);
mIsReflowing = PR_FALSE;
}
DidCauseReflow();

Просмотреть файл

@ -1749,6 +1749,8 @@ PresShell::InitialReflow(nscoord aWidth, nscoord aHeight)
nsresult rv=CreateRenderingContext(rootFrame, &rcx);
if (NS_FAILED(rv)) return rv;
mIsReflowing = PR_TRUE;
nsHTMLReflowState reflowState(mPresContext, rootFrame,
eReflowReason_Initial, rcx, maxSize);
nsIView* view;
@ -1782,6 +1784,8 @@ PresShell::InitialReflow(nscoord aWidth, nscoord aHeight)
NS_FRAME_LOG(NS_FRAME_TRACE_CALLS, ("exit nsPresShell::InitialReflow"));
MOZ_TIMER_DEBUGLOG(("Stop: Reflow: PresShell::InitialReflow(), this=%p\n", this));
MOZ_TIMER_STOP(mReflowWatch);
mIsReflowing = PR_FALSE;
}
DidCauseReflow();