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/bidi.cpp b/WebCore/rendering/bidi.cpp
index 87c1845..5861804 100644
--- a/WebCore/rendering/bidi.cpp
+++ b/WebCore/rendering/bidi.cpp
@@ -174,7 +174,7 @@
next = 0;
if (!oldEndOfInline && !current->isFloating() && !current->isReplaced() && !current->isPositioned()) {
next = current->firstChild();
- if (next && resolver && next->isInlineFlow()) {
+ if (next && resolver && next->isRenderInline()) {
EUnicodeBidi ub = next->style()->unicodeBidi();
if (ub != UBNormal) {
TextDirection dir = next->style()->direction();
@@ -187,19 +187,19 @@
}
if (!next) {
- if (!skipInlines && !oldEndOfInline && current->isInlineFlow()) {
+ if (!skipInlines && !oldEndOfInline && current->isRenderInline()) {
next = current;
endOfInline = true;
break;
}
while (current && current != block) {
- if (resolver && current->isInlineFlow() && current->style()->unicodeBidi() != UBNormal)
+ if (resolver && current->isRenderInline() && current->style()->unicodeBidi() != UBNormal)
resolver->embed(PopDirectionalFormat);
next = current->nextSibling();
if (next) {
- if (resolver && next->isInlineFlow()) {
+ if (resolver && next->isRenderInline()) {
EUnicodeBidi ub = next->style()->unicodeBidi();
if (ub != UBNormal) {
TextDirection dir = next->style()->direction();
@@ -213,7 +213,7 @@
}
current = current->parent();
- if (!skipInlines && current && current != block && current->isInlineFlow()) {
+ if (!skipInlines && current && current != block && current->isRenderInline()) {
next = current;
endOfInline = true;
break;
@@ -226,7 +226,7 @@
if (next->isText() || next->isFloating() || next->isReplaced() || next->isPositioned()
|| ((!skipInlines || !next->firstChild()) // Always return EMPTY inlines.
- && next->isInlineFlow()))
+ && next->isRenderInline()))
break;
current = next;
}
@@ -243,7 +243,7 @@
return 0;
RenderObject* o = block->firstChild();
- if (o->isInlineFlow()) {
+ if (o->isRenderInline()) {
if (resolver) {
EUnicodeBidi ub = o->style()->unicodeBidi();
if (ub != UBNormal) {
@@ -386,7 +386,7 @@
static void appendRunsForObject(int start, int end, RenderObject* obj, InlineBidiResolver& resolver)
{
if (start > end || obj->isFloating() ||
- (obj->isPositioned() && !obj->hasStaticX() && !obj->hasStaticY() && !obj->container()->isInlineFlow()))
+ (obj->isPositioned() && !obj->hasStaticX() && !obj->hasStaticY() && !obj->container()->isRenderInline()))
return;
bool haveNextMidpoint = (sCurrMidpoint < sNumMidpoints);
@@ -464,7 +464,7 @@
InlineFlowBox* parentBox = 0;
InlineFlowBox* result = 0;
do {
- ASSERT(obj->isInlineFlow() || obj == this);
+ ASSERT(obj->isRenderInline() || obj == this);
RenderFlow* flow = static_cast<RenderFlow*>(obj);
// Get the last box we made for this render object.
@@ -595,7 +595,7 @@
needsWordSpacing = !isSpaceOrNewline(rt->characters()[r->m_stop - 1]) && r->m_stop == length;
}
r->m_box->setWidth(rt->width(r->m_start, r->m_stop - r->m_start, totWidth, m_firstLine));
- } else if (!r->m_object->isInlineFlow()) {
+ } else if (!r->m_object->isRenderInline()) {
RenderBox* renderBox = toRenderBox(r->m_object);
renderBox->calcWidth();
r->m_box->setWidth(renderBox->width());
@@ -819,12 +819,12 @@
o->layoutIfNeeded();
}
- } else if (o->isText() || (o->isInlineFlow() && !endOfInline)) {
+ } else if (o->isText() || (o->isRenderInline() && !endOfInline)) {
if (fullLayout || o->selfNeedsLayout())
o->dirtyLineBoxes(fullLayout);
// Calculate margins of inline flows so that they can be used later by line layout.
- if (o->isInlineFlow())
+ if (o->isRenderInline())
static_cast<RenderFlow*>(o)->calcMargins(containerWidth);
o->setNeedsLayout(false);
}
@@ -1388,7 +1388,7 @@
// FIXME: Right now, we only allow line boxes for inlines that are truly empty.
// We need to fix this, though, because at the very least, inlines containing only
// ignorable whitespace should should also have line boxes.
- return flow->isInlineFlow() && !flow->firstChild() && flow->hasHorizontalBordersPaddingOrMargin();
+ return flow->isRenderInline() && !flow->firstChild() && flow->hasHorizontalBordersPaddingOrMargin();
}
static inline bool requiresLineBox(const InlineIterator& it)
@@ -1396,7 +1396,7 @@
if (it.obj->isFloatingOrPositioned())
return false;
- if (it.obj->isInlineFlow() && !inlineFlowRequiresLineBox(toRenderBox(it.obj)))
+ if (it.obj->isRenderInline() && !inlineFlowRequiresLineBox(toRenderBox(it.obj)))
return false;
if (!shouldCollapseWhiteSpace(it.obj->style()) || it.obj->isBR())
@@ -1433,7 +1433,7 @@
// FIXME: The math here is actually not really right. It's a best-guess approximation that
// will work for the common cases
RenderObject* c = object->container();
- if (c->isInlineFlow()) {
+ if (c->isRenderInline()) {
// A relative positioned inline encloses us. In this case, we also have to determine our
// position as though we were an inline. Set |staticX| and |staticY| on the relative positioned
// inline so that we can obtain the value later.
@@ -1468,7 +1468,7 @@
// FIXME: The math here is actually not really right. It's a best-guess approximation that
// will work for the common cases
RenderObject* c = object->container();
- if (c->isInlineFlow()) {
+ if (c->isRenderInline()) {
// A relative positioned inline encloses us. In this case, we also have to determine our
// position as though we were an inline. Set |staticX| and |staticY| on the relative positioned
// inline so that we can obtain the value later.
@@ -1653,7 +1653,7 @@
bool needToCreateLineBox = needToSetStaticX || needToSetStaticY;
RenderObject* c = o->container();
- if (c->isInlineFlow() && (!needToSetStaticX || !needToSetStaticY))
+ if (c->isRenderInline() && (!needToSetStaticX || !needToSetStaticY))
needToCreateLineBox = true;
// If we're ignoring spaces, we have to stop and include this object and
@@ -1669,7 +1669,7 @@
}
}
- } else if (o->isInlineFlow()) {
+ } else if (o->isRenderInline()) {
// Right now, we should only encounter empty inlines here.
ASSERT(!o->firstChild());
