| Index: Source/core/rendering/RenderListItem.cpp
|
| diff --git a/Source/core/rendering/RenderListItem.cpp b/Source/core/rendering/RenderListItem.cpp
|
| index f30b534d165312c06c9794ff5bab0bef7ec281d7..afc60173967e21e30a207f9f9870f2e930714044 100644
|
| --- a/Source/core/rendering/RenderListItem.cpp
|
| +++ b/Source/core/rendering/RenderListItem.cpp
|
| @@ -129,7 +129,7 @@ static RenderListItem* nextListItem(const Node* listNode, const RenderListItem*
|
| continue;
|
| }
|
|
|
| - RenderObject* renderer = current->renderer();
|
| + LayoutObject* renderer = current->renderer();
|
| if (renderer && renderer->isListItem())
|
| return toRenderListItem(renderer);
|
|
|
| @@ -147,7 +147,7 @@ static RenderListItem* previousListItem(const Node* listNode, const RenderListIt
|
| 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));
|
| @@ -216,14 +216,14 @@ 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;
|
|
|
| @@ -240,7 +240,7 @@ static RenderObject* getParentOfFirstLineBox(RenderBlockFlow* curr, RenderObject
|
| (isHTMLUListElement(*currChild->node()) || isHTMLOListElement(*currChild->node())))
|
| break;
|
|
|
| - RenderObject* lineBox = getParentOfFirstLineBox(toRenderBlockFlow(currChild), marker);
|
| + LayoutObject* lineBox = getParentOfFirstLineBox(toRenderBlockFlow(currChild), marker);
|
| if (lineBox)
|
| return lineBox;
|
| }
|
| @@ -257,9 +257,9 @@ void RenderListItem::updateValue()
|
| }
|
| }
|
|
|
| -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;
|
| @@ -283,8 +283,8 @@ void RenderListItem::updateMarkerLocationAndInvalidateWidth()
|
| 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
|
|
|