RenderTreeBuilder => RenderTreeBuilderForElement and RenderTreeBuilderForText

Source/core/dom/Text.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 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 221 matching lines @@
     return TEXT_NODE;
 }
 
 PassRefPtrWillBeRawPtr<Node> Text::cloneNode(bool /*deep*/)
 {
     return cloneWithData(data());
 }
 
 bool Text::textRendererIsNeeded(const RenderStyle& style, const RenderObject& parent)
 {
+    if (!parent.canHaveChildren())
+        return false;
+
     if (isEditingText())
         return true;
 
     if (!length())
         return false;
 
     if (style.display() == NONE)
         return false;
 
     if (!containsOnlyWhitespace())
@@ skipping 45 matching lines @@
         return new RenderSVGInlineText(this, dataImpl());
 
     if (style->hasTextCombine())
         return new RenderCombineText(this, dataImpl());
 
     return new RenderText(this, dataImpl());
 }
 
 void Text::attach(const AttachContext& context)
 {
-    RenderTreeBuilder(this, context.resolvedStyle).createRendererForTextIfNeeded();
+    if (ContainerNode* renderingParent = NodeRenderingTraversal::parent(this)) {
+        if (RenderObject* parentRenderer = renderingParent->renderer()) {
+            if (textRendererIsNeeded(*parentRenderer->style(), *parentRenderer))
+                RenderTreeBuilderForText(this, parentRenderer).createRenderer();
+        }
+    }
     CharacterData::attach(context);
 }
 
 void Text::recalcTextStyle(StyleRecalcChange change, Text* nextTextSibling)
 {
     if (RenderText* renderer = this->renderer()) {
         if (change != NoChange || needsStyleRecalc())
             renderer->setStyle(document().ensureStyleResolver().styleForText(this));
         if (needsStyleRecalc())
             renderer->setText(dataImpl());
@@ skipping 49 matching lines @@
             result.appendLiteral("; ");
         result.appendLiteral("value=");
         result.append(s);
     }
 
     strncpy(buffer, result.toString().utf8().data(), length - 1);
 }
 #endif
 
 } // namespace blink