Merge 142500

Source/WebCore/rendering/RenderTextFragment.cpp

 /*
  * (C) 1999 Lars Knoll (knoll@kde.org)
  * (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. 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
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 67 matching lines @@
 void RenderTextFragment::setText(PassRefPtr<StringImpl> text, bool force)
 {
     RenderText::setText(text, force);
 
     m_start = 0;
     m_end = textLength();
     if (m_firstLetter) {
         ASSERT(!m_contentString);
         m_firstLetter->destroy();
         m_firstLetter = 0;
-        ASSERT(!node() || node()->renderer() == this);
+        if (Node* t = node()) {
+            ASSERT(!t->renderer());
+            t->setRenderer(this);
+        }
     }
 }
 
 void RenderTextFragment::transformText()
 {
     // Don't reset first-letter here because we are only transforming the truncated fragment.
     if (RefPtr<StringImpl> textToTransform = originalText())
         RenderText::setText(textToTransform.release(), true);
 }
 
@@ skipping 14 matching lines @@
     if (!m_firstLetter)
         return 0;
     for (RenderObject* block = m_firstLetter->parent(); block; block = block->parent()) {
         if (block->style()->hasPseudoStyle(FIRST_LETTER) && block->canHaveChildren() && block->isRenderBlock())
             return toRenderBlock(block);
     }
     return 0;
 }
 
 } // namespace WebCore