Merged to trunk

This commit is contained in:
Robert O'Callahan
2008-12-08 20:52:15 +13:00
13 changed files with 336 additions and 58 deletions

View File

@@ -11902,9 +11902,6 @@ nsCSSFrameConstructor::CreateLetterFrame(nsFrameConstructorState& aState,
// content for a non-text frame (because we want its primary frame to
// be a text frame). So use its parent for the first-letter.
nsIContent* letterContent = aTextContent->GetParent();
NS_ASSERTION(!letterContent->IsRootOfNativeAnonymousSubtree(),
"Reframes of this letter frame will mess with the root "
"of a native anonymous content subtree!");
letterFrame->Init(letterContent, aParentFrame, nsnull);
InitAndRestoreFrame(aState, aTextContent, letterFrame, nsnull,