Bug 334460. Turn warning on re-entry into frame construction into an assertion. r=bzbarsky

--HG--
extra : rebase_source : a9c5cf5446a04322956b951c09154a6ebb82cf2a
This commit is contained in:
Timothy Nikkel 2009-09-22 23:52:08 -05:00
Родитель 3e3c06b347
Коммит 15c88c6cce
1 изменённых файлов: 2 добавлений и 3 удалений

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

@ -1174,9 +1174,8 @@ struct nsAutoLayoutPhase {
"constructing frames in the middle of a paint");
NS_ASSERTION(mPresContext->mLayoutPhaseCount[eLayoutPhase_Reflow] == 0,
"constructing frames in the middle of reflow");
// Once bug 337957 is fixed this should become an NS_ASSERTION
NS_WARN_IF_FALSE(mPresContext->mLayoutPhaseCount[eLayoutPhase_FrameC] == 0,
"recurring into frame construction");
NS_ASSERTION(mPresContext->mLayoutPhaseCount[eLayoutPhase_FrameC] == 0,
"recurring into frame construction");
NS_ASSERTION(!nsContentUtils::IsSafeToRunScript(),
"constructing frames and scripts are not blocked");
break;