Rename rendering/RenderList* to layout/LayoutList*

Source/core/layout/LayoutListItem.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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #include "config.h"
-#include "core/rendering/RenderListItem.h"
+#include "core/layout/LayoutListItem.h"
 
 #include "core/HTMLNames.h"
 #include "core/dom/NodeRenderingTraversal.h"
 #include "core/html/HTMLOListElement.h"
+#include "core/layout/LayoutListMarker.h"
 #include "core/layout/TextAutosizer.h"
-#include "core/rendering/RenderListMarker.h"
 #include "core/rendering/RenderView.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
-RenderListItem::RenderListItem(Element* element)
+LayoutListItem::LayoutListItem(Element* element)
     : RenderBlockFlow(element)
     , m_marker(nullptr)
     , m_hasExplicitValue(false)
     , m_isValueUpToDate(false)
     , m_notInList(false)
 {
     setInline(false);
 }
 
-void RenderListItem::styleDidChange(StyleDifference diff, const LayoutStyle* oldStyle)
+void LayoutListItem::styleDidChange(StyleDifference diff, const LayoutStyle* oldStyle)
 {
     RenderBlockFlow::styleDidChange(diff, oldStyle);
 
     if (style()->listStyleType() != NoneListStyle
         || (style()->listStyleImage() && !style()->listStyleImage()->errorOccurred())) {
         if (!m_marker)
-            m_marker = RenderListMarker::createAnonymous(this);
+            m_marker = LayoutListMarker::createAnonymous(this);
         m_marker->listItemStyleDidChange();
     } else if (m_marker) {
         m_marker->destroy();
         m_marker = nullptr;
     }
 }
 
-void RenderListItem::willBeDestroyed()
+void LayoutListItem::willBeDestroyed()
 {
     if (m_marker) {
         m_marker->destroy();
         m_marker = nullptr;
     }
     RenderBlockFlow::willBeDestroyed();
 }
 
-void RenderListItem::insertedIntoTree()
+void LayoutListItem::insertedIntoTree()
 {
     RenderBlockFlow::insertedIntoTree();
 
     updateListMarkerNumbers();
 }
 
-void RenderListItem::willBeRemovedFromTree()
+void LayoutListItem::willBeRemovedFromTree()
 {
     RenderBlockFlow::willBeRemovedFromTree();
 
     updateListMarkerNumbers();
 }
 
 static bool isList(const Node& node)
 {
     return isHTMLUListElement(node) || isHTMLOListElement(node);
 }
 
 // Returns the enclosing list with respect to the DOM order.
-static Node* enclosingList(const RenderListItem* listItem)
+static Node* enclosingList(const LayoutListItem* listItem)
 {
     Node* listItemNode = listItem->node();
     if (!listItemNode)
         return nullptr;
     Node* firstNode = nullptr;
     // We use parentNode because the enclosing list could be a ShadowRoot that's not Element.
     for (Node* parent = NodeRenderingTraversal::parent(*listItemNode); parent; parent = NodeRenderingTraversal::parent(*parent)) {
         if (isList(*parent))
             return parent;
         if (!firstNode)
             firstNode = parent;
     }
 
     // If there's no actual <ul> or <ol> list element, then the first found
     // node acts as our list for purposes of determining what other list items
     // should be numbered as part of the same list.
     return firstNode;
 }
 
 // Returns the next list item with respect to the DOM order.
-static RenderListItem* nextListItem(const Node* listNode, const RenderListItem* item = 0)
+static LayoutListItem* nextListItem(const Node* listNode, const LayoutListItem* item = 0)
 {
     if (!listNode)
         return 0;
 
     const Node* current = item ? item->node() : listNode;
     ASSERT(current);
     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;
         }
 
         LayoutObject* renderer = current->renderer();
         if (renderer && renderer->isListItem())
-            return toRenderListItem(renderer);
+            return toLayoutListItem(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)
+static LayoutListItem* previousListItem(const Node* listNode, const LayoutListItem* 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)) {
         LayoutObject* renderer = current->renderer();
         if (!renderer || (renderer && !renderer->isListItem()))
             continue;
-        Node* otherList = enclosingList(toRenderListItem(renderer));
+        Node* otherList = enclosingList(toLayoutListItem(renderer));
         // This item is part of our current list, so it's what we're looking for.
         if (listNode == otherList)
-            return toRenderListItem(renderer);
+            return toLayoutListItem(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.
         if (otherList)
             current = NodeRenderingTraversal::next(*otherList, listNode);
     }
     return 0;
 }
 
-void RenderListItem::updateItemValuesForOrderedList(const HTMLOListElement* listNode)
+void LayoutListItem::updateItemValuesForOrderedList(const HTMLOListElement* listNode)
 {
     ASSERT(listNode);
 
-    for (RenderListItem* listItem = nextListItem(listNode); listItem; listItem = nextListItem(listNode, listItem))
+    for (LayoutListItem* listItem = nextListItem(listNode); listItem; listItem = nextListItem(listNode, listItem))
         listItem->updateValue();
 }
 
-unsigned RenderListItem::itemCountForOrderedList(const HTMLOListElement* listNode)
+unsigned LayoutListItem::itemCountForOrderedList(const HTMLOListElement* listNode)
 {
     ASSERT(listNode);
 
     unsigned itemCount = 0;
-    for (RenderListItem* listItem = nextListItem(listNode); listItem; listItem = nextListItem(listNode, listItem))
+    for (LayoutListItem* listItem = nextListItem(listNode); listItem; listItem = nextListItem(listNode, listItem))
         itemCount++;
 
     return itemCount;
 }
 
-inline int RenderListItem::calcValue() const
+inline int LayoutListItem::calcValue() const
 {
     if (m_hasExplicitValue)
         return m_explicitValue;
 
     Node* list = enclosingList(this);
     HTMLOListElement* oListElement = isHTMLOListElement(list) ? toHTMLOListElement(list) : 0;
     int valueStep = 1;
     if (oListElement && oListElement->isReversed())
         valueStep = -1;
 
     // FIXME: This recurses to a possible depth of the length of the list.
     // That's not good -- we need to change this to an iterative algorithm.
-    if (RenderListItem* previousItem = previousListItem(list, this))
+    if (LayoutListItem* previousItem = previousListItem(list, this))
         return previousItem->value() + valueStep;
 
     if (oListElement)
         return oListElement->start();
 
     return 1;
 }
 
-void RenderListItem::updateValueNow() const
+void LayoutListItem::updateValueNow() const
 {
     m_value = calcValue();
     m_isValueUpToDate = true;
 }
 
-bool RenderListItem::isEmpty() const
+bool LayoutListItem::isEmpty() const
 {
     return lastChild() == m_marker;
 }
 
 static LayoutObject* getParentOfFirstLineBox(RenderBlockFlow* curr, LayoutObject* marker)
 {
     LayoutObject* firstChild = curr->firstChild();
     if (!firstChild)
         return 0;
 
     bool inQuirksMode = curr->document().inQuirksMode();
     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())))
+        if (curr->isListItem() && inQuirksMode && currChild->node()
+            && (isHTMLUListElement(*currChild->node()) || isHTMLOListElement(*currChild->node())))
             break;
 
         LayoutObject* lineBox = getParentOfFirstLineBox(toRenderBlockFlow(currChild), marker);
         if (lineBox)
             return lineBox;
     }
 
     return 0;
 }
 
-void RenderListItem::updateValue()
+void LayoutListItem::updateValue()
 {
     if (!m_hasExplicitValue) {
         m_isValueUpToDate = false;
         if (m_marker)
             m_marker->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation();
     }
 }
 
 static LayoutObject* firstNonMarkerChild(LayoutObject* parent)
 {
     LayoutObject* result = parent->slowFirstChild();
     while (result && result->isListMarker())
         result = result->nextSibling();
     return result;
 }
 
-void RenderListItem::updateMarkerLocationAndInvalidateWidth()
+void LayoutListItem::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()
+bool LayoutListItem::updateMarkerLocation()
 {
     ASSERT(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;
     }
 
     if (markerParent != lineBoxParent) {
         m_marker->remove();
         lineBoxParent->addChild(m_marker, firstNonMarkerChild(lineBoxParent));
         m_marker->updateMarginsAndContent();
         // If markerParent is an anonymous block with no children, destroy it.
         if (markerParent && markerParent->isAnonymousBlock() && !toRenderBlock(markerParent)->firstChild() && !toRenderBlock(markerParent)->continuation())
             markerParent->destroy();
         return true;
     }
 
     return false;
 }
 
-void RenderListItem::layout()
+void LayoutListItem::layout()
 {
     ASSERT(needsLayout());
 
     if (m_marker) {
         // The marker must be autosized before calling
         // updateMarkerLocationAndInvalidateWidth. It cannot be done in the
         // parent's beginLayout because it is not yet in the render tree.
         if (TextAutosizer* textAutosizer = document().textAutosizer())
             textAutosizer->inflateListItem(this, m_marker);
 
         updateMarkerLocationAndInvalidateWidth();
     }
 
     RenderBlockFlow::layout();
 }
 
-void RenderListItem::addOverflowFromChildren()
+void LayoutListItem::addOverflowFromChildren()
 {
     RenderBlockFlow::addOverflowFromChildren();
     positionListMarker();
 }
 
-void RenderListItem::positionListMarker()
+void LayoutListItem::positionListMarker()
 {
     if (m_marker && m_marker->parent()->isBox() && !m_marker->isInside() && m_marker->inlineBoxWrapper()) {
         LayoutUnit markerOldLogicalLeft = m_marker->logicalLeft();
         LayoutUnit blockOffset = 0;
         LayoutUnit lineOffset = 0;
         for (RenderBox* o = m_marker->parentBox(); o != this; o = o->parentBox()) {
             blockOffset += o->logicalTop();
             lineOffset += o->logicalLeft();
         }
 
@@ skipping 73 matching lines @@
                     propagateVisualOverflow = false;
                 }
                 if (o->hasSelfPaintingLayer())
                     propagateVisualOverflow = false;
                 markerRect.moveBy(-o->location());
             } while (o != this && propagateVisualOverflow && propagateLayoutOverflow);
         }
     }
 }
 
-void RenderListItem::paint(const PaintInfo& paintInfo, const LayoutPoint& paintOffset)
+void LayoutListItem::paint(const PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     if (!logicalHeight() && hasOverflowClip())
         return;
 
     RenderBlockFlow::paint(paintInfo, paintOffset);
 }
 
-const String& RenderListItem::markerText() const
+const String& LayoutListItem::markerText() const
 {
     if (m_marker)
         return m_marker->text();
     return nullAtom.string();
 }
 
-void RenderListItem::explicitValueChanged()
+void LayoutListItem::explicitValueChanged()
 {
     if (m_marker)
         m_marker->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation();
     Node* listNode = enclosingList(this);
-    for (RenderListItem* item = this; item; item = nextListItem(listNode, item))
+    for (LayoutListItem* item = this; item; item = nextListItem(listNode, item))
         item->updateValue();
 }
 
-void RenderListItem::setExplicitValue(int value)
+void LayoutListItem::setExplicitValue(int value)
 {
     ASSERT(node());
 
     if (m_hasExplicitValue && m_explicitValue == value)
         return;
     m_explicitValue = value;
     m_value = value;
     m_hasExplicitValue = true;
     explicitValueChanged();
 }
 
-void RenderListItem::clearExplicitValue()
+void LayoutListItem::clearExplicitValue()
 {
     ASSERT(node());
 
     if (!m_hasExplicitValue)
         return;
     m_hasExplicitValue = false;
     m_isValueUpToDate = false;
     explicitValueChanged();
 }
 
-void RenderListItem::setNotInList(bool notInList)
+void LayoutListItem::setNotInList(bool notInList)
 {
     m_notInList = notInList;
     if (m_marker)
         updateMarkerLocation();
 }
 
-static RenderListItem* previousOrNextItem(bool isListReversed, Node* list, RenderListItem* item)
+static LayoutListItem* previousOrNextItem(bool isListReversed, Node* list, LayoutListItem* item)
 {
     return isListReversed ? previousListItem(list, item) : nextListItem(list, item);
 }
 
-void RenderListItem::updateListMarkerNumbers()
+void LayoutListItem::updateListMarkerNumbers()
 {
     // If distribution recalc is needed, updateListMarkerNumber will be re-invoked
     // after distribution is calculated.
     if (node()->document().childNeedsDistributionRecalc())
         return;
 
     Node* listNode = enclosingList(this);
     ASSERT(listNode);
 
     bool isListReversed = false;
     HTMLOListElement* oListElement = isHTMLOListElement(listNode) ? toHTMLOListElement(listNode) : 0;
     if (oListElement) {
         oListElement->itemCountChanged();
         isListReversed = oListElement->isReversed();
     }
 
     // FIXME: The n^2 protection below doesn't help if the elements were inserted after the
     // the list had already been displayed.
 
     // Avoid an O(n^2) walk over the children below when they're all known to be attaching.
     if (listNode->needsAttach())
         return;
 
-    for (RenderListItem* item = previousOrNextItem(isListReversed, listNode, this); item; item = previousOrNextItem(isListReversed, listNode, item)) {
+    for (LayoutListItem* item = previousOrNextItem(isListReversed, listNode, this); item; item = previousOrNextItem(isListReversed, listNode, item)) {
         if (!item->m_isValueUpToDate) {
             // If an item has been marked for update before, we can safely
             // 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