Turn warning on constructing frames in the middle of reflow back into an assertion, now that the dependent bugs are fixed. b=336756

This commit is contained in:
dbaron@dbaron.org 2007-07-04 13:40:14 -07:00
parent 2feaae333d
commit ca4e531583

View File

@ -916,10 +916,8 @@ struct nsAutoLayoutPhase {
case eLayoutPhase_FrameC:
NS_ASSERTION(mPresContext->mLayoutPhaseCount[eLayoutPhase_Paint] == 0,
"constructing frames in the middle of a paint");
// The popup code causes us to hit this too often to be an
// NS_ASSERTION, despite how scary it is.
NS_WARN_IF_FALSE(mPresContext->mLayoutPhaseCount[eLayoutPhase_Reflow] == 0,
"constructing frames in the middle of reflow");
NS_ASSERTION(mPresContext->mLayoutPhaseCount[eLayoutPhase_Reflow] == 0,
"constructing frames in the middle of reflow");
// The nsXBLService::LoadBindings call in ConstructFrameInternal
// makes us hit this one too often to be an NS_ASSERTION,
// despite how scary it is.