Rename renderer() to layoutObject().

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 140 matching lines @@
     RefPtrWillBeRawPtr<Text> newText = cloneWithData(oldStr.substring(offset));
     setDataWithoutUpdate(oldStr.substring(0, offset));
 
     didModifyData(oldStr, CharacterData::UpdateFromNonParser);
 
     if (parentNode())
         parentNode()->insertBefore(newText.get(), nextSibling(), exceptionState);
     if (exceptionState.hadException())
         return nullptr;
 
-    if (renderer())
-        renderer()->setTextWithOffset(dataImpl(), 0, oldStr.length());
+    if (layoutObject())
+        layoutObject()->setTextWithOffset(dataImpl(), 0, oldStr.length());
 
     if (parentNode())
         document().didSplitTextNode(*this);
 
     return newText.release();
 }
 
 static const Text* earliestLogicallyAdjacentTextNode(const Text* t)
 {
     for (const Node* n = t->previousSibling(); n; n = n->previousSibling()) {
@@ skipping 155 matching lines @@
         if (parent.isLayoutBlock() && !parent.childrenInline() && (!prev || !prev->isInline()))
             return false;
 
         // Avoiding creation of a Renderer for the text node is a non-essential memory optimization.
         // So to avoid blowing up on very wide DOMs, we limit the number of siblings to visit.
         unsigned maxSiblingsToVisit = 50;
 
         LayoutObject* first = parent.slowFirstChild();
         while (first && first->isFloatingOrOutOfFlowPositioned() && maxSiblingsToVisit--)
             first = first->nextSibling();
-        if (!first || first == renderer() || NodeRenderingTraversal::nextSiblingRenderer(*this) == first)
+        if (!first || first == layoutObject() || NodeRenderingTraversal::nextSiblingRenderer(*this) == first)
             // Whitespace at the start of a block just goes away.  Don't even
             // make a render object for this text.
             return false;
     }
     return true;
 }
 
 static bool isSVGText(Text* text)
 {
     Node* parentOrShadowHostNode = text->parentOrShadowHostNode();
     ASSERT(parentOrShadowHostNode);
     return parentOrShadowHostNode->isSVGElement() && !isSVGForeignObjectElement(*parentOrShadowHostNode);
 }
 
 LayoutText* Text::createTextRenderer(LayoutStyle* style)
 {
     if (isSVGText(this))
         return new LayoutSVGInlineText(this, dataImpl());
 
     if (style->hasTextCombine())
         return new LayoutTextCombine(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 (LayoutObject* parentRenderer = renderingParent->layoutObject()) {
             if (textRendererIsNeeded(*parentRenderer->style(), *parentRenderer))
                 LayoutTreeBuilderForText(*this, parentRenderer).createLayoutObject();
         }
     }
     CharacterData::attach(context);
 }
 
 void Text::reattachIfNeeded(const AttachContext& context)
 {
     bool layoutObjectIsNeeded = false;
     ContainerNode* renderingParent = NodeRenderingTraversal::parent(*this);
     if (renderingParent) {
-        if (LayoutObject* parentRenderer = renderingParent->renderer()) {
+        if (LayoutObject* parentRenderer = renderingParent->layoutObject()) {
             if (textRendererIsNeeded(*parentRenderer->style(), *parentRenderer))
                 layoutObjectIsNeeded = true;
         }
     }
 
-    if (layoutObjectIsNeeded == !!renderer())
+    if (layoutObjectIsNeeded == !!layoutObject())
         return;
 
     // The following is almost the same as Node::reattach() except that we create renderer only if needed.
     // Not calling reattach() to avoid repeated calls to Text::textRendererIsNeeded().
     AttachContext reattachContext(context);
     reattachContext.performingReattach = true;
 
     if (styleChangeType() < NeedsReattachStyleChange)
         detach(reattachContext);
     if (layoutObjectIsNeeded)
-        LayoutTreeBuilderForText(*this, renderingParent->renderer()).createLayoutObject();
+        LayoutTreeBuilderForText(*this, renderingParent->layoutObject()).createLayoutObject();
     CharacterData::attach(reattachContext);
 }
 
 void Text::recalcTextStyle(StyleRecalcChange change, Text* nextTextSibling)
 {
-    if (LayoutText* renderer = this->renderer()) {
+    if (LayoutText* renderer = this->layoutObject()) {
         if (change != NoChange || needsStyleRecalc())
             renderer->setStyle(document().ensureStyleResolver().styleForText(this));
         if (needsStyleRecalc())
             renderer->setText(dataImpl());
         clearNeedsStyleRecalc();
     } else if (needsStyleRecalc() || needsWhitespaceRenderer()) {
         reattach();
-        if (this->renderer())
+        if (this->layoutObject())
             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());
+    ASSERT(!layoutObject());
     if (LayoutStyle* style = parentLayoutStyle())
         return style->preserveNewline();
     return false;
 }
 
 void Text::updateTextRenderer(unsigned offsetOfReplacedData, unsigned lengthOfReplacedData, RecalcStyleBehavior recalcStyleBehavior)
 {
     if (!inActiveDocument())
         return;
-    LayoutText* textRenderer = renderer();
+    LayoutText* textRenderer = layoutObject();
     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