Merge 98010

Source/WebCore/rendering/RenderBlock.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 5465 matching lines @@
 
     if (!currChild)
         return;
 
     // If the child already has style, then it has already been created, so we just want
     // to update it.
     if (currChild->parent()->style()->styleType() == FIRST_LETTER) {
         RenderObject* firstLetter = currChild->parent();
         RenderObject* firstLetterContainer = firstLetter->parent();
         RenderStyle* pseudoStyle = styleForFirstLetter(firstLetterBlock, firstLetterContainer);
+        ASSERT(firstLetter->isFloating() || firstLetter->isInline());
 
         if (Node::diff(firstLetter->style(), pseudoStyle) == Node::Detach) {
             // The first-letter renderer needs to be replaced. Create a new renderer of the right type.
             RenderObject* newFirstLetter;
             if (pseudoStyle->display() == INLINE)
                 newFirstLetter = new (renderArena()) RenderInline(document());
             else
                 newFirstLetter = new (renderArena()) RenderBlock(document());
             newFirstLetter->setStyle(pseudoStyle);
 
@@ skipping 10 matching lines @@
             RenderObject* nextSibling = firstLetter->nextSibling();
             RenderObject* next = nextSibling;
             while (next) {
                 if (next->isText() && toRenderText(next)->isTextFragment()) {
                     remainingText = toRenderTextFragment(next);
                     break;
                 }
                 next = next->nextSibling();
             }
             if (remainingText) {
-                ASSERT(remainingText->node()->renderer() == remainingText);
+                ASSERT(remainingText->isAnonymous() || remainingText->node()->renderer() == remainingText);
                 // Replace the old renderer with the new one.
                 remainingText->setFirstLetter(newFirstLetter);
             }
             firstLetter->destroy();
             firstLetter = newFirstLetter;
             firstLetterContainer->addChild(firstLetter, nextSibling);
         } else
             firstLetter->setStyle(pseudoStyle);
 
         for (RenderObject* genChild = firstLetter->firstChild(); genChild; genChild = genChild->nextSibling()) {
@@ skipping 1077 matching lines @@
 }
 
 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::FloatingObject* floatingObject)
 {
     return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->x(), floatingObject->y(), floatingObject->maxX(), floatingObject->maxY());
 }
 
 #endif
 
 } // namespace WebCore