Fix assertion in bug 468645, per bzbarsky's followup review comment. r+sr=bzbarsky

2009-01-04 14:52:38 -05:00
parent f4d32dd3b2
commit 4dc1cd9094
1 changed files with 2 additions and 1 deletions
--- a/layout/base/nsFrameManager.cpp
+++ b/layout/base/nsFrameManager.cpp
@@ -1112,7 +1112,8 @@ nsFrameManager::ReResolveStyleContext(nsPresContext     *aPresContext,
                                      nsStyleChangeList *aChangeList, 
                                      nsChangeHint       aMinChange)
 {
-  NS_ASSERTION(aFrame->GetContent() || !aFrame->GetParent(),
+  NS_ASSERTION(aFrame->GetContent() ||
+               (!aFrame->GetParent() && !aParentContent),
               "frame must have content (unless viewport)");
  // XXXldb get new context from prev-in-flow if possible, to avoid
  // duplication.  (Or should we just let |GetContext| handle that?)