Move rendering/RenderObject to layout/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 219 matching lines @@
 Node::NodeType Text::nodeType() const
 {
     return TEXT_NODE;
 }
 
 PassRefPtrWillBeRawPtr<Node> Text::cloneNode(bool /*deep*/)
 {
     return cloneWithData(data());
 }
 
-static inline bool canHaveWhitespaceChildren(const RenderObject& parent)
+static inline bool canHaveWhitespaceChildren(const LayoutObject& parent)
 {
     // <button> should allow whitespace even though RenderFlexibleBox doesn't.
     if (parent.isRenderButton())
         return true;
 
     if (parent.isTable() || parent.isTableRow() || parent.isTableSection()
         || parent.isLayoutTableCol() || parent.isFrameSet()
         || parent.isFlexibleBox() || parent.isRenderGrid()
         || parent.isSVGRoot()
         || parent.isSVGContainer()
         || parent.isSVGImage()
         || parent.isSVGShape())
         return false;
     return true;
 }
 
-bool Text::textRendererIsNeeded(const RenderStyle& style, const RenderObject& parent)
+bool Text::textRendererIsNeeded(const RenderStyle& style, const LayoutObject& parent)
 {
     if (!parent.canHaveChildren())
         return false;
 
     if (isEditingText())
         return true;
 
     if (!length())
         return false;
 
     if (style.display() == NONE)
         return false;
 
     if (!containsOnlyWhitespace())
         return true;
 
     if (!canHaveWhitespaceChildren(parent))
         return false;
 
     if (style.preserveNewline()) // pre/pre-wrap/pre-line always make renderers.
         return true;
 
     // childNeedsDistributionRecalc() here is rare, only happens JS calling surroundContents() etc. from DOMNodeInsertedIntoDocument etc.
     if (document().childNeedsDistributionRecalc())
         return true;
 
-    const RenderObject* prev = NodeRenderingTraversal::previousSiblingRenderer(*this);
+    const LayoutObject* prev = NodeRenderingTraversal::previousSiblingRenderer(*this);
     if (prev && prev->isBR()) // <span><br/> <br/></span>
         return false;
 
     if (parent.isRenderInline()) {
         // <span><div/> <div/></span>
         if (prev && !prev->isInline())
             return false;
     } else {
         if (parent.isRenderBlock() && !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;
 
-        RenderObject* first = parent.slowFirstChild();
+        LayoutObject* first = parent.slowFirstChild();
         while (first && first->isFloatingOrOutOfFlowPositioned() && maxSiblingsToVisit--)
             first = first->nextSibling();
         if (!first || first == renderer() || 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;
 }
 
@@ skipping 11 matching lines @@
 
     if (style->hasTextCombine())
         return new RenderCombineText(this, dataImpl());
 
     return new RenderText(this, dataImpl());
 }
 
 void Text::attach(const AttachContext& context)
 {
     if (ContainerNode* renderingParent = NodeRenderingTraversal::parent(*this)) {
-        if (RenderObject* parentRenderer = renderingParent->renderer()) {
+        if (LayoutObject* parentRenderer = renderingParent->renderer()) {
             if (textRendererIsNeeded(*parentRenderer->style(), *parentRenderer))
                 RenderTreeBuilderForText(*this, parentRenderer).createRenderer();
         }
     }
     CharacterData::attach(context);
 }
 
 void Text::reattachIfNeeded(const AttachContext& context)
 {
     bool rendererIsNeeded = false;
     ContainerNode* renderingParent = NodeRenderingTraversal::parent(*this);
     if (renderingParent) {
-        if (RenderObject* parentRenderer = renderingParent->renderer()) {
+        if (LayoutObject* parentRenderer = renderingParent->renderer()) {
             if (textRendererIsNeeded(*parentRenderer->style(), *parentRenderer))
                 rendererIsNeeded = true;
         }
     }
 
     if (rendererIsNeeded == !!renderer())
         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().
@@ skipping 66 matching lines @@
             result.appendLiteral("; ");
         result.appendLiteral("value=");
         result.append(s);
     }
 
     strncpy(buffer, result.toString().utf8().data(), length - 1);
 }
 #endif
 
 } // namespace blink