Rename RenderText to LayoutText

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 15 matching lines @@
 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "core/SVGNames.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/NodeLayoutStyle.h"
 #include "core/dom/NodeRenderingTraversal.h"
 #include "core/dom/NodeTraversal.h"
 #include "core/dom/RenderTreeBuilder.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/events/ScopedEventQueue.h"
+#include "core/layout/LayoutText.h"
+#include "core/layout/LayoutTextCombine.h"
 #include "core/layout/svg/LayoutSVGInlineText.h"
-#include "core/rendering/RenderCombineText.h"
-#include "core/rendering/RenderText.h"
 #include "core/svg/SVGForeignObjectElement.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
 
 #if ENABLE(OILPAN)
 namespace {
 // If the external string kept by a Text node exceed this threshold length,
 // Oilpan is informed. External allocation amounts owned by heap objects are
@@ skipping 294 matching lines @@
     return true;
 }
 
 static bool isSVGText(Text* text)
 {
     Node* parentOrShadowHostNode = text->parentOrShadowHostNode();
     ASSERT(parentOrShadowHostNode);
     return parentOrShadowHostNode->isSVGElement() && !isSVGForeignObjectElement(*parentOrShadowHostNode);
 }
 
-RenderText* Text::createTextRenderer(LayoutStyle* style)
+LayoutText* Text::createTextRenderer(LayoutStyle* style)
 {
     if (isSVGText(this))
         return new LayoutSVGInlineText(this, dataImpl());
 
     if (style->hasTextCombine())
-        return new RenderCombineText(this, dataImpl());
+        return new LayoutTextCombine(this, dataImpl());
 
-    return new RenderText(this, dataImpl());
+    return new LayoutText(this, dataImpl());
 }
 
 void Text::attach(const AttachContext& context)
 {
     if (ContainerNode* renderingParent = NodeRenderingTraversal::parent(*this)) {
         if (LayoutObject* parentRenderer = renderingParent->renderer()) {
             if (textRendererIsNeeded(*parentRenderer->style(), *parentRenderer))
                 RenderTreeBuilderForText(*this, parentRenderer).createRenderer();
         }
     }
@@ skipping 21 matching lines @@
 
     if (styleChangeType() < NeedsReattachStyleChange)
         detach(reattachContext);
     if (rendererIsNeeded)
         RenderTreeBuilderForText(*this, renderingParent->renderer()).createRenderer();
     CharacterData::attach(reattachContext);
 }
 
 void Text::recalcTextStyle(StyleRecalcChange change, Text* nextTextSibling)
 {
-    if (RenderText* renderer = this->renderer()) {
+    if (LayoutText* renderer = this->renderer()) {
         if (change != NoChange || needsStyleRecalc())
             renderer->setStyle(document().ensureStyleResolver().styleForText(this));
         if (needsStyleRecalc())
             renderer->setText(dataImpl());
         clearNeedsStyleRecalc();
     } else if (needsStyleRecalc() || needsWhitespaceRenderer()) {
         reattach();
         if (this->renderer())
             reattachWhitespaceSiblingsIfNeeded(nextTextSibling);
     }
 }
 
 // If a whitespace node had no renderer and goes through a recalcStyle it may
 // need to create one if the parent style now has white-space: pre.
 bool Text::needsWhitespaceRenderer()
 {
     ASSERT(!renderer());
     if (LayoutStyle* style = parentLayoutStyle())
         return style->preserveNewline();
     return false;
 }
 
 void Text::updateTextRenderer(unsigned offsetOfReplacedData, unsigned lengthOfReplacedData, RecalcStyleBehavior recalcStyleBehavior)
 {
     if (!inActiveDocument())
         return;
-    RenderText* textRenderer = renderer();
+    LayoutText* textRenderer = renderer();
     if (!textRenderer || !textRendererIsNeeded(*textRenderer->style(), *textRenderer->parent())) {
         lazyReattachIfAttached();
         // FIXME: Editing should be updated so this is not neccesary.
         if (recalcStyleBehavior == DeprecatedRecalcStyleImmediatlelyForEditing)
             document().updateRenderTreeIfNeeded();
         return;
     }
     textRenderer->setTextWithOffset(dataImpl(), offsetOfReplacedData, lengthOfReplacedData);
 }
 
@@ skipping 24 matching lines @@
             result.appendLiteral("; ");
         result.appendLiteral("value=");
         result.append(s);
     }
 
     strncpy(buffer, result.toString().utf8().data(), length - 1);
 }
 #endif
 
 } // namespace blink