Move rendering/RenderObject to layout/LayoutObject.

Source/core/layout/CounterNode.h

 /*
  * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 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.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 19 matching lines @@
 // and for propagating count changes when nodes are added or removed.
 
 // Parents represent unique counters and their scope, which are created either explicitly
 // by "counter-reset" style rules or implicitly by referring to a counter that is not in scope.
 // Such nodes are tagged as "reset" nodes, although they are not all due to "counter-reset".
 
 // Not that render tree children are often counter tree siblings due to counter scoping rules.
 
 namespace blink {
 
-class RenderObject;
+class LayoutObject;
 class LayoutCounter;
 
 class CounterNode : public RefCounted<CounterNode> {
 public:
-    static PassRefPtr<CounterNode> create(RenderObject&, bool isReset, int value);
+    static PassRefPtr<CounterNode> create(LayoutObject&, bool isReset, int value);
     ~CounterNode();
     bool actsAsReset() const { return m_hasResetType || !m_parent; }
     bool hasResetType() const { return m_hasResetType; }
     int value() const { return m_value; }
     int countInParent() const { return m_countInParent; }
-    RenderObject& owner() const { return m_owner; }
+    LayoutObject& owner() const { return m_owner; }
     void addRenderer(LayoutCounter*);
     void removeRenderer(LayoutCounter*);
 
     // Invalidates the text in the renderers of this counter, if any.
     void resetRenderers();
 
     CounterNode* parent() const { return m_parent; }
     CounterNode* previousSibling() const { return m_previousSibling; }
     CounterNode* nextSibling() const { return m_nextSibling; }
     CounterNode* firstChild() const { return m_firstChild; }
     CounterNode* lastChild() const { return m_lastChild; }
     CounterNode* lastDescendant() const;
     CounterNode* previousInPreOrder() const;
     CounterNode* nextInPreOrder(const CounterNode* stayWithin = 0) const;
     CounterNode* nextInPreOrderAfterChildren(const CounterNode* stayWithin = 0) const;
 
     void insertAfter(CounterNode* newChild, CounterNode* beforeChild, const AtomicString& identifier);
 
     // identifier must match the identifier of this counter.
     void removeChild(CounterNode*);
 
 private:
-    CounterNode(RenderObject&, bool isReset, int value);
+    CounterNode(LayoutObject&, bool isReset, int value);
     int computeCountInParent() const;
     // Invalidates the text in the renderer of this counter, if any,
     // and in the renderers of all descendants of this counter, if any.
     void resetThisAndDescendantsRenderers();
     void recount();
 
     bool m_hasResetType;
     int m_value;
     int m_countInParent;
-    RenderObject& m_owner;
+    LayoutObject& m_owner;
     LayoutCounter* m_rootRenderer;
 
     CounterNode* m_parent;
     CounterNode* m_previousSibling;
     CounterNode* m_nextSibling;
     CounterNode* m_firstChild;
     CounterNode* m_lastChild;
 };
 
 } // namespace blink
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 void showCounterTree(const blink::CounterNode*);
 #endif
 
 #endif // CounterNode_h