2009-01-26 David Hyatt <hyatt@apple.com>
Eliminate isInlineFlow() now that a RenderBlock can never be an inline flow. isInlineFlow() is now
equivalent to isRenderInline(), so all calls to isInlineFlow() have been replaced with isRenderInline().
Reviewed by Eric Seidel
* dom/Text.cpp:
(WebCore::Text::rendererIsNeeded):
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::placeBoxesHorizontally):
(WebCore::shouldDrawTextDecoration):
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::hitTestContents):
(WebCore::InlineMinMaxIterator::next):
(WebCore::RenderBlock::calcInlinePrefWidths):
* rendering/RenderBlock.h:
(WebCore::RenderBlock::isBlockFlow):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::clientWidth):
(WebCore::RenderBox::clientHeight):
(WebCore::RenderBox::nodeAtPoint):
(WebCore::RenderBox::imageChanged):
(WebCore::RenderBox::offsetForPositionedInContainer):
(WebCore::RenderBox::containingBlockWidthForPositioned):
(WebCore::RenderBox::containingBlockHeightForPositioned):
* rendering/RenderBox.h:
(WebCore::RenderBox::width):
(WebCore::RenderBox::height):
(WebCore::RenderBox::size):
(WebCore::RenderBox::frameRect):
* rendering/RenderContainer.cpp:
(WebCore::RenderContainer::updateBeforeAfterContentForContainer):
* rendering/RenderFlow.cpp:
(WebCore::RenderFlow::dirtyLinesFromChangedChild):
(WebCore::RenderFlow::createInlineBox):
(WebCore::RenderFlow::paintLines):
(WebCore::RenderFlow::hitTestLines):
(WebCore::RenderFlow::absoluteClippedOverflowRect):
(WebCore::RenderFlow::lowestPosition):
(WebCore::RenderFlow::rightmostPosition):
(WebCore::RenderFlow::leftmostPosition):
* rendering/RenderFlow.h:
(WebCore::RenderFlow::borderBoundingBox):
* rendering/RenderInline.h:
(WebCore::RenderInline::isRenderInline):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::updateLayerPosition):
(WebCore::RenderLayer::intersectsDamageRect):
(WebCore::RenderLayer::boundingBox):
* rendering/RenderListItem.cpp:
(WebCore::getParentOfFirstLineBox):
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getAbsoluteRepaintRectWithOutline):
(WebCore::RenderObject::styleWillChange):
(WebCore::RenderObject::firstLineStyle):
* rendering/RenderObject.h:
* rendering/RenderSVGInline.cpp:
(WebCore::RenderSVGInline::createInlineBox):
* rendering/RenderSVGText.cpp:
(WebCore::RenderSVGText::createInlineBox):
* rendering/RenderTableRow.cpp:
(WebCore::RenderTableRow::nodeAtPoint):
* rendering/RenderTableSection.cpp:
(WebCore::RenderTableSection::nodeAtPoint):
* rendering/RenderText.cpp:
(WebCore::isInlineFlowOrEmptyText):
* rendering/RenderTreeAsText.cpp:
(WebCore::operator<<):
* rendering/bidi.cpp:
(WebCore::bidiNext):
(WebCore::bidiFirst):
(WebCore::appendRunsForObject):
(WebCore::RenderBlock::createLineBoxes):
(WebCore::RenderBlock::computeHorizontalPositionsForLine):
(WebCore::RenderBlock::layoutInlineChildren):
(WebCore::inlineFlowRequiresLineBox):
(WebCore::requiresLineBox):
(WebCore::RenderBlock::skipTrailingWhitespace):
(WebCore::RenderBlock::skipLeadingWhitespace):
(WebCore::RenderBlock::findNextLineBreak):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@40264 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/rendering/RenderListItem.cpp b/WebCore/rendering/RenderListItem.cpp
index 4550c03..47158b6 100644
--- a/WebCore/rendering/RenderListItem.cpp
+++ b/WebCore/rendering/RenderListItem.cpp
@@ -144,7 +144,7 @@
if (currChild == marker)
continue;
- if (currChild->isInline() && (!currChild->isInlineFlow() || curr->generatesLineBoxesForInlineChild(currChild)))
+ if (currChild->isInline() && (!currChild->isRenderInline() || curr->generatesLineBoxesForInlineChild(currChild)))
return curr;
if (currChild->isFloating() || currChild->isPositioned())
