Move rendering/RenderObject to layout/LayoutObject.

Source/core/dom/Node.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-2011, 2014 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * 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
@@ skipping 59 matching lines @@
 class NodeRareData;
 class PlatformGestureEvent;
 class PlatformKeyboardEvent;
 class PlatformMouseEvent;
 class PlatformWheelEvent;
 class QualifiedName;
 class RadioNodeList;
 class RegisteredEventListener;
 class RenderBox;
 class RenderBoxModelObject;
-class RenderObject;
+class LayoutObject;
 class RenderStyle;
 class SVGQualifiedName;
 class ShadowRoot;
 template <typename NodeType> class StaticNodeTypeList;
 using StaticNodeList = StaticNodeTypeList<Node>;
 class TagCollection;
 class Text;
 class TouchEvent;
 class WeakNodeMap;
 
 const int nodeStyleChangeShift = 19;
 
 enum StyleChangeType {
     NoStyleChange = 0,
     LocalStyleChange = 1 << nodeStyleChangeShift,
     SubtreeStyleChange = 2 << nodeStyleChangeShift,
     NeedsReattachStyleChange = 3 << nodeStyleChangeShift,
 };
 
 class NodeRareDataBase {
 public:
-    RenderObject* renderer() const { return m_renderer; }
-    void setRenderer(RenderObject* renderer) { m_renderer = renderer; }
+    LayoutObject* renderer() const { return m_renderer; }
+    void setRenderer(LayoutObject* renderer) { m_renderer = renderer; }
 
 protected:
-    NodeRareDataBase(RenderObject* renderer)
+    NodeRareDataBase(LayoutObject* renderer)
         : m_renderer(renderer)
     { }
 
 protected:
     // Oilpan: This member is traced in NodeRareData.
     // FIXME: Can we add traceAfterDispatch and finalizeGarbageCollectedObject
     // to NodeRareDataBase, and make m_renderer Member<>?
-    RenderObject* m_renderer;
+    LayoutObject* m_renderer;
 };
 
 class Node;
 WILL_NOT_BE_EAGERLY_TRACED_CLASS(Node);
 
 #if ENABLE(OILPAN)
 #define NODE_BASE_CLASSES public EventTarget
 #else
 // TreeShared should be the last to pack TreeShared::m_refCount and
 // Node::m_nodeFlags on 64bit platforms.
@@ skipping 372 matching lines @@
     virtual int maxCharacterOffset() const;
 
     // Whether or not a selection can be started in this object
     virtual bool canStartSelection() const;
 
     // -----------------------------------------------------------------------------
     // Integration with rendering tree
 
     // As renderer() includes a branch you should avoid calling it repeatedly in hot code paths.
     // Note that if a Node has a renderer, it's parentNode is guaranteed to have one as well.
-    RenderObject* renderer() const { return hasRareData() ? m_data.m_rareData->renderer() : m_data.m_renderer; };
-    void setRenderer(RenderObject* renderer)
+    LayoutObject* renderer() const { return hasRareData() ? m_data.m_rareData->renderer() : m_data.m_renderer; };
+    void setRenderer(LayoutObject* renderer)
     {
         if (hasRareData())
             m_data.m_rareData->setRenderer(renderer);
         else
             m_data.m_renderer = renderer;
     }
 
     // Use these two methods with caution.
     RenderBox* renderBox() const;
     RenderBoxModelObject* renderBoxModelObject() const;
 
     struct AttachContext {
         RenderStyle* resolvedStyle;
         bool performingReattach;
 
         AttachContext() : resolvedStyle(nullptr), performingReattach(false) { }
     };
 
     // Attaches this node to the rendering tree. This calculates the style to be applied to the node and creates an
-    // appropriate RenderObject which will be inserted into the tree (except when the style has display: none). This
+    // appropriate LayoutObject which will be inserted into the tree (except when the style has display: none). This
     // makes the node visible in the FrameView.
     virtual void attach(const AttachContext& = AttachContext());
 
     // Detaches the node from the rendering tree, making it invisible in the rendered view. This method will remove
     // the node's rendering object from the rendering tree and delete it.
     virtual void detach(const AttachContext& = AttachContext());
 
 #if ENABLE(ASSERT)
     bool inDetach() const;
 #endif
@@ skipping 275 matching lines @@
     WillBeHeapHashSet<RawPtrWillBeMember<MutationObserverRegistration> >* transientMutationObserverRegistry();
 
     uint32_t m_nodeFlags;
     RawPtrWillBeMember<ContainerNode> m_parentOrShadowHostNode;
     RawPtrWillBeMember<TreeScope> m_treeScope;
     RawPtrWillBeMember<Node> m_previous;
     RawPtrWillBeMember<Node> m_next;
     // When a node has rare data we move the renderer into the rare data.
     union DataUnion {
         DataUnion() : m_renderer(nullptr) { }
-        RenderObject* m_renderer;
+        LayoutObject* m_renderer;
         NodeRareDataBase* m_rareData;
     } m_data;
 };
 
 inline void Node::setParentOrShadowHostNode(ContainerNode* parent)
 {
     ASSERT(isMainThread());
     m_parentOrShadowHostNode = parent;
 }
 
@@ skipping 68 matching lines @@
 } // namespace blink
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 void showNode(const blink::Node*);
 void showTree(const blink::Node*);
 void showNodePath(const blink::Node*);
 #endif
 
 #endif // Node_h