Move rendering/RenderObject to layout/LayoutObject.

Source/core/rendering/RenderListItem.cpp

 /**
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
  *
  * 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 111 matching lines @@
     ASSERT(!current->document().childNeedsDistributionRecalc());
     current = NodeRenderingTraversal::next(*current, listNode);
 
     while (current) {
         if (isList(*current)) {
             // We've found a nested, independent list: nothing to do here.
             current = NodeRenderingTraversal::nextSkippingChildren(*current, listNode);
             continue;
         }
 
-        RenderObject* renderer = current->renderer();
+        LayoutObject* renderer = current->renderer();
         if (renderer && renderer->isListItem())
             return toRenderListItem(renderer);
 
         // FIXME: Can this be optimized to skip the children of the elements without a renderer?
         current = NodeRenderingTraversal::next(*current, listNode);
     }
 
     return 0;
 }
 
 // Returns the previous list item with respect to the DOM order.
 static RenderListItem* previousListItem(const Node* listNode, const RenderListItem* item)
 {
     Node* current = item->node();
     ASSERT(current);
     ASSERT(!current->document().childNeedsDistributionRecalc());
     for (current = NodeRenderingTraversal::previous(*current, listNode); current && current != listNode; current = NodeRenderingTraversal::previous(*current, listNode)) {
-        RenderObject* renderer = current->renderer();
+        LayoutObject* renderer = current->renderer();
         if (!renderer || (renderer && !renderer->isListItem()))
             continue;
         Node* otherList = enclosingList(toRenderListItem(renderer));
         // This item is part of our current list, so it's what we're looking for.
         if (listNode == otherList)
             return toRenderListItem(renderer);
         // We found ourself inside another list; lets skip the rest of it.
         // Use nextIncludingPseudo() here because the other list itself may actually
         // be a list item itself. We need to examine it, so we do this to counteract
         // the previousIncludingPseudo() that will be done by the loop.
@@ skipping 48 matching lines @@
 {
     m_value = calcValue();
     m_isValueUpToDate = true;
 }
 
 bool RenderListItem::isEmpty() const
 {
     return lastChild() == m_marker;
 }
 
-static RenderObject* getParentOfFirstLineBox(RenderBlockFlow* curr, RenderObject* marker)
+static LayoutObject* getParentOfFirstLineBox(RenderBlockFlow* curr, LayoutObject* marker)
 {
-    RenderObject* firstChild = curr->firstChild();
+    LayoutObject* firstChild = curr->firstChild();
     if (!firstChild)
         return 0;
 
     bool inQuirksMode = curr->document().inQuirksMode();
-    for (RenderObject* currChild = firstChild; currChild; currChild = currChild->nextSibling()) {
+    for (LayoutObject* currChild = firstChild; currChild; currChild = currChild->nextSibling()) {
         if (currChild == marker)
             continue;
 
         if (currChild->isInline() && (!currChild->isRenderInline() || curr->generatesLineBoxesForInlineChild(currChild)))
             return curr;
 
         if (currChild->isFloating() || currChild->isOutOfFlowPositioned())
             continue;
 
         if (!currChild->isRenderBlockFlow() || (currChild->isBox() && toRenderBox(currChild)->isWritingModeRoot()))
             break;
 
         if (curr->isListItem() && inQuirksMode && currChild->node() &&
             (isHTMLUListElement(*currChild->node()) || isHTMLOListElement(*currChild->node())))
             break;
 
-        RenderObject* lineBox = getParentOfFirstLineBox(toRenderBlockFlow(currChild), marker);
+        LayoutObject* lineBox = getParentOfFirstLineBox(toRenderBlockFlow(currChild), marker);
         if (lineBox)
             return lineBox;
     }
 
     return 0;
 }
 
 void RenderListItem::updateValue()
 {
     if (!m_hasExplicitValue) {
         m_isValueUpToDate = false;
         if (m_marker)
             m_marker->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation();
     }
 }
 
-static RenderObject* firstNonMarkerChild(RenderObject* parent)
+static LayoutObject* firstNonMarkerChild(LayoutObject* parent)
 {
-    RenderObject* result = parent->slowFirstChild();
+    LayoutObject* result = parent->slowFirstChild();
     while (result && result->isListMarker())
         result = result->nextSibling();
     return result;
 }
 
 void RenderListItem::updateMarkerLocationAndInvalidateWidth()
 {
     ASSERT(m_marker);
 
     // FIXME: We should not modify the structure of the render tree
     // during layout. crbug.com/370461
     DeprecatedDisableModifyRenderTreeStructureAsserts disabler;
     if (updateMarkerLocation()) {
         // If the marker is inside we need to redo the preferred width calculations
         // as the size of the item now includes the size of the list marker.
         if (m_marker->isInside())
             containingBlock()->updateLogicalWidth();
     }
 }
 
 bool RenderListItem::updateMarkerLocation()
 {
     ASSERT(m_marker);
-    RenderObject* markerParent = m_marker->parent();
-    RenderObject* lineBoxParent = getParentOfFirstLineBox(this, m_marker);
+    LayoutObject* markerParent = m_marker->parent();
+    LayoutObject* lineBoxParent = getParentOfFirstLineBox(this, m_marker);
     if (!lineBoxParent) {
         // If the marker is currently contained inside an anonymous box, then we
         // are the only item in that anonymous box (since no line box parent was
         // found). It's ok to just leave the marker where it is in this case.
         if (markerParent && markerParent->isAnonymousBlock())
             lineBoxParent = markerParent;
         else
             lineBoxParent = this;
     }
 
@@ skipping 216 matching lines @@
             // assume that all the following ones have too.
             // This gives us the opportunity to stop here and avoid
             // marking the same nodes again.
             break;
         }
         item->updateValue();
     }
 }
 
 } // namespace blink