Bug 499841. Fix a failed attempt at a merge.

2010-01-02 18:56:29 -06:00
parent 8ebdbcab77
commit 4f1d759b7f
1 changed files with 2 additions and 1 deletions
@@ -9620,7 +9620,8 @@ nsCSSFrameConstructor::CreateLetterFrame(nsIFrame* aBlockFrame,
    aTextContent->SetPrimaryFrame(nsnull);
    nsIFrame* textFrame = NS_NewTextFrame(mPresShell, textSC);

-    NS_ASSERTION(aBlockFrame == GetFloatContainingBlock(aParentFrame),
+    NS_ASSERTION(aBlockFrame == GetFloatContainingBlock(aParentFrame)->
+                   GetFirstContinuation(),
                 "Containing block is confused");
    nsFrameConstructorState state(mPresShell, mFixedContainingBlock,
                                  GetAbsoluteContainingBlock(aParentFrame),