Move rendering/RenderObject to layout/LayoutObject.

Source/core/dom/RenderTreeBuilder.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2011 Google 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
@@ skipping 13 matching lines @@
  */
 
 #ifndef RenderTreeBuilder_h
 #define RenderTreeBuilder_h
 
 #include "core/dom/Document.h"
 #include "core/dom/FirstLetterPseudoElement.h"
 #include "core/dom/Node.h"
 #include "core/dom/NodeRenderingTraversal.h"
 #include "core/dom/Text.h"
-#include "core/rendering/RenderObject.h"
+#include "core/layout/LayoutObject.h"
 #include "wtf/RefPtr.h"
 
 namespace blink {
 
-class RenderObject;
+class LayoutObject;
 class RenderStyle;
 
 template <typename NodeType>
 class RenderTreeBuilder {
     STACK_ALLOCATED();
 protected:
-    RenderTreeBuilder(NodeType& node, RenderObject* renderingParent)
+    RenderTreeBuilder(NodeType& node, LayoutObject* renderingParent)
         : m_node(node)
         , m_renderingParent(renderingParent)
     {
         ASSERT(!node.renderer());
         ASSERT(node.needsAttach());
         ASSERT(node.document().inStyleRecalc());
 
         // FIXME: We should be able to ASSERT(node->inActiveDocument()) but childrenChanged is called
         // before ChildNodeInsertionNotifier in ContainerNode's methods and some implementations
         // will trigger a layout inside childrenChanged.
         // Mainly HTMLTextAreaElement::childrenChanged calls HTMLTextFormControlElement::setSelectionRange
         // which does an updateLayoutIgnorePendingStylesheets.
     }
 
-    RenderObject* parentRenderer() const { return m_renderingParent; }
+    LayoutObject* parentRenderer() const { return m_renderingParent; }
 
-    RenderObject* nextRenderer() const
+    LayoutObject* nextRenderer() const
     {
         ASSERT(m_renderingParent);
 
         // Avoid an O(N^2) walk over the children when reattaching all children of a node.
         if (m_renderingParent->node() && m_renderingParent->node()->needsAttach())
             return 0;
 
         return NodeRenderingTraversal::nextSiblingRenderer(*m_node);
     }
 
     RawPtrWillBeMember<NodeType> m_node;
-    RawPtrWillBeMember<RenderObject> m_renderingParent;
+    RawPtrWillBeMember<LayoutObject> m_renderingParent;
 };
 
 class RenderTreeBuilderForElement : public RenderTreeBuilder<Element> {
 public:
     RenderTreeBuilderForElement(Element&, RenderStyle*);
 
     void createRendererIfNeeded()
     {
         if (shouldCreateRenderer())
             createRenderer();
     }
 
 private:
-    RenderObject* parentRenderer() const;
-    RenderObject* nextRenderer() const;
+    LayoutObject* parentRenderer() const;
+    LayoutObject* nextRenderer() const;
     bool shouldCreateRenderer() const;
     RenderStyle& style() const;
     void createRenderer();
 
     mutable RefPtr<RenderStyle> m_style;
 };
 
 class RenderTreeBuilderForText : public RenderTreeBuilder<Text> {
 public:
-    RenderTreeBuilderForText(Text& text, RenderObject* renderingParent)
+    RenderTreeBuilderForText(Text& text, LayoutObject* renderingParent)
         : RenderTreeBuilder(text, renderingParent) { }
 
     void createRenderer();
 };
 
 } // namespace blink
 
 #endif