Back out affd9b74be00 (bug 874418) for unexpected crashtest assertions

CLOSED TREE
This commit is contained in:
Phil Ringnalda 2013-05-24 19:00:38 -07:00
Родитель 27947b9be3
Коммит 35e6b8bc90
1 изменённых файлов: 0 добавлений и 27 удалений

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

@ -97,33 +97,6 @@ nsPlaceholderFrame::Reflow(nsPresContext* aPresContext,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus)
{
#ifdef DEBUG
// We should be getting reflowed before our out-of-flow.
// If this is our first reflow, and our out-of-flow has already received its
// first reflow (before us), complain.
if ((GetStateBits() & NS_FRAME_FIRST_REFLOW) &&
!(mOutOfFlowFrame->GetStateBits() & NS_FRAME_FIRST_REFLOW)) {
// Unfortunately, this can currently happen when the placeholder is in a
// later continuation than its out-of-flow (as is the case in some unit
// tests). So for now, in that case, we'll warn instead of asserting.
bool isInContinuation = false;
nsIFrame* ancestor = this;
while ((ancestor = ancestor->GetParent())) {
if (ancestor->GetPrevContinuation()) {
isInContinuation = true;
break;
}
}
if (isInContinuation) {
NS_WARNING("Out-of-flow frame got reflowed before its placeholder");
} else {
NS_ERROR("Out-of-flow frame got reflowed before its placeholder");
}
}
#endif
DO_GLOBAL_REFLOW_COUNT("nsPlaceholderFrame");
DISPLAY_REFLOW(aPresContext, this, aReflowState, aDesiredSize, aStatus);
aDesiredSize.width = 0;