From 6e8e93c0aae204f4bda66f650683f973b77bd9e6 Mon Sep 17 00:00:00 2001 From: "dbaron%dbaron.org" Date: Fri, 5 May 2006 16:31:59 +0000 Subject: [PATCH] Convert one other assertion to a warning. b=310985 --- layout/base/nsPresContext.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h index 1cfbbf912358..be720b48bd0b 100644 --- a/layout/base/nsPresContext.h +++ b/layout/base/nsPresContext.h @@ -827,8 +827,10 @@ struct nsAutoLayoutPhase { case eLayoutPhase_FrameC: NS_ASSERTION(mPresContext->mLayoutPhaseCount[eLayoutPhase_Paint] == 0, "constructing frames in the middle of a paint"); - NS_ASSERTION(mPresContext->mLayoutPhaseCount[eLayoutPhase_Reflow] == 0, - "constructing frames in the middle of reflow"); + // 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"); // The nsXBLService::LoadBindings call in ConstructFrameInternal // makes us hit this one too often to be an NS_ASSERTION, // despite how scary it is.