Commit 415d8de4 authored by hyatt@apple.com's avatar hyatt@apple.com

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
parent cd8b895e
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):
2009-01-26 David Hyatt <hyatt@apple.com>
Drop support for display:compact.
......@@ -209,7 +209,7 @@ bool Text::rendererIsNeeded(RenderStyle *style)
if (prev && prev->isBR()) // <span><br/> <br/></span>
return false;
if (par->isInlineFlow()) {
if (par->isRenderInline()) {
// <span><div/> <div/></span>
if (prev && !prev->isInline())
return false;
......
......@@ -328,7 +328,7 @@ int InlineFlowBox::placeBoxesHorizontally(int x, int& leftPosition, int& rightPo
curr->setXPos(root()->block()->width()-x);
continue; // The positioned object has no effect on the width.
}
if (curr->object()->isInlineFlow()) {
if (curr->object()->isRenderInline()) {
InlineFlowBox* flow = static_cast<InlineFlowBox*>(curr);
x += flow->marginLeft();
x = flow->placeBoxesHorizontally(x, leftPosition, rightPosition, needsWordSpacing);
......@@ -852,7 +852,7 @@ void InlineFlowBox::paintMask(RenderObject::PaintInfo& paintInfo, int tx, int ty
static bool shouldDrawTextDecoration(RenderObject* obj)
{
for (RenderObject* curr = obj->firstChild(); curr; curr = curr->nextSibling()) {
if (curr->isInlineFlow())
if (curr->isRenderInline())
return true;
if (curr->isText() && !curr->isBR()) {
if (!curr->style()->collapseWhiteSpace())
......
......@@ -3189,7 +3189,7 @@ bool RenderBlock::hitTestContents(const HitTestRequest& request, HitTestResult&
for (RenderObject* child = lastChild(); child; child = child->previousSibling()) {
// FIXME: We have to skip over inline flows, since they can show up inside RenderTables at the moment (a demoted inline <form> for example). If we ever implement a
// table-specific hit-test method (which we should do for performance reasons anyway), then we can remove this check.
if (!child->hasLayer() && !child->isFloating() && !child->isInlineFlow() && child->nodeAtPoint(request, result, x, y, tx, ty, childHitTest)) {
if (!child->hasLayer() && !child->isFloating() && !child->isRenderInline() && child->nodeAtPoint(request, result, x, y, tx, ty, childHitTest)) {
updateHitTestResult(result, IntPoint(x - tx, y - ty));
return true;
}
......@@ -3726,7 +3726,7 @@ RenderObject* InlineMinMaxIterator::next()
result = current->firstChild();
if (!result) {
// We hit the end of our inline. (It was empty, e.g., <span></span>.)
if (!oldEndOfInline && current->isInlineFlow()) {
if (!oldEndOfInline && current->isRenderInline()) {
result = current;
endOfInline = true;
break;
......@@ -3736,7 +3736,7 @@ RenderObject* InlineMinMaxIterator::next()
result = current->nextSibling();
if (result) break;
current = current->parent();
if (current && current != parent && current->isInlineFlow()) {
if (current && current != parent && current->isRenderInline()) {
result = current;
endOfInline = true;
break;
......@@ -3747,7 +3747,7 @@ RenderObject* InlineMinMaxIterator::next()
if (!result)
break;
if (!result->isPositioned() && (result->isText() || result->isFloating() || result->isReplaced() || result->isInlineFlow()))
if (!result->isPositioned() && (result->isText() || result->isFloating() || result->isReplaced() || result->isRenderInline()))
break;
current = result;
......@@ -3866,7 +3866,7 @@ void RenderBlock::calcInlinePrefWidths()
if (!child->isText()) {
// Case (1) and (2). Inline replaced and inline flow elements.
if (child->isInlineFlow()) {
if (child->isRenderInline()) {
// Add in padding/border/margin from the appropriate side of
// the element.
int bpm = getBorderPaddingMargin(static_cast<RenderFlow*>(child), childIterator.endOfInline);
......@@ -4043,7 +4043,7 @@ void RenderBlock::calcInlinePrefWidths()
}
oldAutoWrap = autoWrap;
if (!child->isInlineFlow())
if (!child->isRenderInline())
previousLeaf = child;
}
......
......@@ -56,7 +56,6 @@ public:
virtual bool isRenderBlock() const { return true; }
virtual bool isBlockFlow() const { return (!isInline() || isReplaced()) && !isTable(); }
virtual bool isInlineFlow() const { return isInline() && !isReplaced(); }
virtual bool isInlineBlockOrInlineTable() const { return isInline() && isReplaced(); }
virtual bool childrenInline() const { return m_childrenInline; }
......
......@@ -361,14 +361,14 @@ RenderBox* RenderBox::offsetParent() const
// excluding border and scrollbar.
int RenderBox::clientWidth() const
{
if (isInlineFlow())
if (isRenderInline())
return 0;
return width() - borderLeft() - borderRight() - verticalScrollbarWidth();
}
int RenderBox::clientHeight() const
{
if (isInlineFlow())
if (isRenderInline())
return 0;
return height() - borderTop() - borderBottom() - horizontalScrollbarHeight();
}
......@@ -702,7 +702,7 @@ bool RenderBox::nodeAtPoint(const HitTestRequest& request, HitTestResult& result
// at the moment (a demoted inline <form> for example). If we ever implement a
// table-specific hit-test method (which we should do for performance reasons anyway),
// then we can remove this check.
if (!child->hasLayer() && !child->isInlineFlow() && child->nodeAtPoint(request, result, xPos, yPos, tx, ty, action)) {
if (!child->hasLayer() && !child->isRenderInline() && child->nodeAtPoint(request, result, xPos, yPos, tx, ty, action)) {
updateHitTestResult(result, IntPoint(xPos - tx, yPos - ty));
return true;
}
......@@ -949,8 +949,10 @@ IntSize RenderBox::calculateBackgroundSize(const FillLayer* bgLayer, int scaledW
void RenderBox::imageChanged(WrappedImagePtr image, const IntRect*)
{
if (isInlineFlow() ||
style()->borderImage().image() && style()->borderImage().image()->data() == image ||
if (!parent())
return;
if (isRenderInline() || style()->borderImage().image() && style()->borderImage().image()->data() == image ||
style()->maskBoxImage().image() && style()->maskBoxImage().image()->data() == image) {
repaint();
return;
......@@ -1345,7 +1347,7 @@ int RenderBox::containingBlockWidth() const
IntSize RenderBox::offsetForPositionedInContainer(RenderObject* container) const
{
if (!container->isRelPositioned() || !container->isInlineFlow())
if (!container->isRelPositioned() || !container->isRenderInline())
return IntSize();
// When we have an enclosing relpositioned inline, we need to add in the offset of the first line
......@@ -2179,7 +2181,7 @@ void RenderBox::setStaticY(int staticY)
int RenderBox::containingBlockWidthForPositioned(const RenderObject* containingBlock) const
{
if (containingBlock->isInlineFlow()) {
if (containingBlock->isRenderInline()) {
ASSERT(containingBlock->isRelPositioned());
const RenderFlow* flow = static_cast<const RenderFlow*>(containingBlock);
......@@ -2212,7 +2214,7 @@ int RenderBox::containingBlockHeightForPositioned(const RenderObject* containing
const RenderBox* containingBlockBox = toRenderBox(containingBlock);
int heightResult;
if (containingBlock->isInlineFlow()) {
if (containingBlock->isRenderInline()) {
ASSERT(containingBlock->isRelPositioned());
heightResult = static_cast<const RenderFlow*>(containingBlock)->linesBoundingBox().height();
} else
......
......@@ -39,8 +39,8 @@ public:
int x() const { return m_frameRect.x(); }
int y() const { return m_frameRect.y(); }
int width() const { ASSERT(!isInlineFlow()); return m_frameRect.width(); }
int height() const { ASSERT(!isInlineFlow()); return m_frameRect.height(); }
int width() const { ASSERT(!isRenderInline()); return m_frameRect.width(); }
int height() const { ASSERT(!isRenderInline()); return m_frameRect.height(); }
void setX(int x) { m_frameRect.setX(x); }
void setY(int y) { m_frameRect.setY(y); }
......@@ -48,7 +48,7 @@ public:
void setHeight(int height) { m_frameRect.setHeight(height); }
IntPoint location() const { return m_frameRect.location(); }
IntSize size() const { ASSERT(!isInlineFlow()); return m_frameRect.size(); }
IntSize size() const { ASSERT(!isRenderInline()); return m_frameRect.size(); }
void setLocation(const IntPoint& location) { m_frameRect.setLocation(location); }
void setLocation(int x, int y) { setLocation(IntPoint(x, y)); }
......@@ -56,7 +56,7 @@ public:
void setSize(const IntSize& size) { m_frameRect.setSize(size); }
void move(int dx, int dy) { m_frameRect.move(dx, dy); }
IntRect frameRect() const { ASSERT(!isInlineFlow()); return m_frameRect; }
IntRect frameRect() const { ASSERT(!isRenderInline()); return m_frameRect; }
void setFrameRect(const IntRect& rect) { m_frameRect = rect; }
IntRect borderBoxRect() const { return IntRect(0, 0, width(), height()); }
......
......@@ -301,7 +301,7 @@ void RenderContainer::updateBeforeAfterContentForContainer(RenderStyle::PseudoId
if (!newContentWanted)
return;
if (isInlineFlow() && !pseudoElementStyle->isDisplayInlineType() && pseudoElementStyle->floating() == FNONE &&
if (isRenderInline() && !pseudoElementStyle->isDisplayInlineType() && pseudoElementStyle->floating() == FNONE &&
!(pseudoElementStyle->position() == AbsolutePosition || pseudoElementStyle->position() == FixedPosition))
// According to the CSS2 spec (the end of section 12.1), the only allowed
// display values for the pseudo style are NONE and INLINE for inline flows.
......
......@@ -246,7 +246,7 @@ void RenderFlow::destroy()
void RenderFlow::dirtyLinesFromChangedChild(RenderObject* child)
{
if (!parent() || (selfNeedsLayout() && !isInlineFlow()) || isTable())
if (!parent() || (selfNeedsLayout() && !isRenderInline()) || isTable())
return;
// If we have no first line box, then just bail early.
......@@ -275,7 +275,7 @@ void RenderFlow::dirtyLinesFromChangedChild(RenderObject* child)
InlineTextBox* textBox = toRenderText(curr)->lastTextBox();
if (textBox)
box = textBox->root();
} else if (curr->isInlineFlow()) {
} else if (curr->isRenderInline()) {
InlineRunBox* runBox = static_cast<RenderFlow*>(curr)->lastLineBox();
if (runBox)
box = runBox->root();
......@@ -355,7 +355,7 @@ InlineBox* RenderFlow::createInlineBox(bool makePlaceHolderBox, bool isRootLineB
return RenderContainer::createInlineBox(false, isRootLineBox); // (or positioned element placeholders).
InlineFlowBox* flowBox = 0;
if (isInlineFlow())
if (isRenderInline())
flowBox = new (renderArena()) InlineFlowBox(this);
else
flowBox = new (renderArena()) RootInlineBox(this);
......@@ -381,7 +381,7 @@ void RenderFlow::paintLines(PaintInfo& paintInfo, int tx, int ty)
&& paintInfo.phase != PaintPhaseMask)
return;
bool inlineFlow = isInlineFlow();
bool inlineFlow = isRenderInline();
if (inlineFlow)
ASSERT(m_layer); // The only way an inline could paint like this is if it has a layer.
......@@ -449,7 +449,7 @@ bool RenderFlow::hitTestLines(const HitTestRequest& request, HitTestResult& resu
if (hitTestAction != HitTestForeground)
return false;
bool inlineFlow = isInlineFlow();
bool inlineFlow = isRenderInline();
if (inlineFlow)
ASSERT(m_layer); // The only way an inline can hit test like this is if it has a layer.
......@@ -482,7 +482,7 @@ bool RenderFlow::hitTestLines(const HitTestRequest& request, HitTestResult& resu
IntRect RenderFlow::absoluteClippedOverflowRect()
{
if (isInlineFlow()) {
if (isRenderInline()) {
// Only run-ins are allowed in here during layout.
ASSERT(!view() || !view()->layoutStateEnabled() || isRunIn());
......@@ -500,7 +500,7 @@ IntRect RenderFlow::absoluteClippedOverflowRect()
// We need to add in the relative position offsets of any inlines (including us) up to our
// containing block.
RenderBlock* cb = containingBlock();
for (RenderObject* inlineFlow = this; inlineFlow && inlineFlow->isInlineFlow() && inlineFlow != cb;
for (RenderObject* inlineFlow = this; inlineFlow && inlineFlow->isRenderInline() && inlineFlow != cb;
inlineFlow = inlineFlow->parent()) {
if (inlineFlow->style()->position() == RelativePosition && inlineFlow->hasLayer())
toRenderBox(inlineFlow)->layer()->relativePositionOffset(left, top);
......@@ -572,7 +572,7 @@ IntRect RenderFlow::linesBoundingBox() const
int RenderFlow::lowestPosition(bool includeOverflowInterior, bool includeSelf) const
{
ASSERT(!isInlineFlow());
ASSERT(!isRenderInline());
if (!includeOverflowInterior && (hasOverflowClip() || hasControlClip()))
return includeSelf && width() > 0 ? overflowHeight(false) : 0;
......@@ -583,7 +583,7 @@ int RenderFlow::lowestPosition(bool includeOverflowInterior, bool includeSelf) c
// a tiny rel div buried somewhere deep in our child tree. In this case we have to get to
// the abs div.
for (RenderObject* c = firstChild(); c; c = c->nextSibling()) {
if (!c->isFloatingOrPositioned() && !c->isText() && !c->isInlineFlow())
if (!c->isFloatingOrPositioned() && !c->isText() && !c->isRenderInline())
bottom = max(bottom, toRenderBox(c)->y() + c->lowestPosition(false));
}
}
......@@ -596,7 +596,7 @@ int RenderFlow::lowestPosition(bool includeOverflowInterior, bool includeSelf) c
int RenderFlow::rightmostPosition(bool includeOverflowInterior, bool includeSelf) const
{
ASSERT(!isInlineFlow());
ASSERT(!isRenderInline());
if (!includeOverflowInterior && (hasOverflowClip() || hasControlClip()))
return includeSelf && height() > 0 ? overflowWidth(false) : 0;
......@@ -608,7 +608,7 @@ int RenderFlow::rightmostPosition(bool includeOverflowInterior, bool includeSelf
// a tiny rel div buried somewhere deep in our child tree. In this case we have to get to
// the abs div.
for (RenderObject* c = firstChild(); c; c = c->nextSibling()) {
if (!c->isFloatingOrPositioned() && c->isBox() && !c->isInlineFlow())
if (!c->isFloatingOrPositioned() && c->isBox() && !c->isRenderInline())
right = max(right, toRenderBox(c)->x() + c->rightmostPosition(false));
}
}
......@@ -621,7 +621,7 @@ int RenderFlow::rightmostPosition(bool includeOverflowInterior, bool includeSelf
int RenderFlow::leftmostPosition(bool includeOverflowInterior, bool includeSelf) const
{
ASSERT(!isInlineFlow());
ASSERT(!isRenderInline());
if (!includeOverflowInterior && (hasOverflowClip() || hasControlClip()))
return includeSelf && height() > 0 ? overflowLeft(false) : width();
......@@ -632,7 +632,7 @@ int RenderFlow::leftmostPosition(bool includeOverflowInterior, bool includeSelf)
// a tiny rel div buried somewhere deep in our child tree. In this case we have to get to
// the abs div.
for (RenderObject* c = firstChild(); c; c = c->nextSibling()) {
if (!c->isFloatingOrPositioned() && c->isBox() && !c->isInlineFlow())
if (!c->isFloatingOrPositioned() && c->isBox() && !c->isRenderInline())
left = min(left, toRenderBox(c)->x() + c->leftmostPosition(false));
}
}
......
......@@ -111,7 +111,7 @@ public:
virtual IntRect borderBoundingBox() const
{
if (isInlineFlow()) {
if (isRenderInline()) {
IntRect boundingBox = linesBoundingBox();
return IntRect(0, 0, boundingBox.width(), boundingBox.height());
}
......
......@@ -39,7 +39,6 @@ public:
virtual const char* renderName() const;
virtual bool isRenderInline() const { return true; }
virtual bool isInlineFlow() const { return true; }
virtual bool childrenInline() const { return true; }
virtual bool isInlineContinuation() const;
......
......@@ -426,7 +426,7 @@ void RenderLayer::updateLayerPosition()
setPos(x, y);
if (renderer()->isInlineFlow()) {
if (renderer()->isRenderInline()) {
RenderFlow* inlineFlow = static_cast<RenderFlow*>(renderer());
IntRect lineBox = inlineFlow->linesBoundingBox();
setWidth(lineBox.width());
......@@ -2190,7 +2190,7 @@ bool RenderLayer::intersectsDamageRect(const IntRect& layerBounds, const IntRect
// can go ahead and return true.
RenderView* view = renderer()->view();
ASSERT(view);
if (view && !renderer()->isInlineFlow()) {
if (view && !renderer()->isRenderInline()) {
IntRect b = layerBounds;
b.inflate(view->maximalOutlineSize());
if (b.intersects(damageRect))
......@@ -2214,7 +2214,7 @@ IntRect RenderLayer::boundingBox(const RenderLayer* rootLayer) const
// as part of our bounding box. We do this because we are the responsible layer for both hit testing and painting those
// floats.
IntRect result;
if (renderer()->isInlineFlow()) {
if (renderer()->isRenderInline()) {
// Go from our first line box to our last line box.
RenderInline* inlineFlow = static_cast<RenderInline*>(renderer());
InlineFlowBox* firstBox = inlineFlow->firstLineBox();
......
......@@ -144,7 +144,7 @@ static RenderObject* getParentOfFirstLineBox(RenderBlock* curr, RenderObject* ma
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())
......
......@@ -1799,7 +1799,7 @@ IntRect RenderObject::getAbsoluteRepaintRectWithOutline(int ow)
if (virtualContinuation() && !isInline())
r.inflateY(toRenderBox(this)->collapsedMarginTop());
if (isInlineFlow()) {
if (isRenderInline()) {
for (RenderObject* curr = firstChild(); curr; curr = curr->nextSibling()) {
if (!curr->isText())
r.unite(curr->getAbsoluteRepaintRectWithOutline(ow));
......@@ -2059,7 +2059,7 @@ void RenderObject::styleWillChange(RenderStyle::Diff diff, const RenderStyle* ne
s_affectsParentBlock = isFloatingOrPositioned() &&
(!newStyle->isFloating() && newStyle->position() != AbsolutePosition && newStyle->position() != FixedPosition)
&& parent() && (parent()->isBlockFlow() || parent()->isInlineFlow());
&& parent() && (parent()->isBlockFlow() || parent()->isRenderInline());
// reset style flags
if (diff == RenderStyle::Layout || diff == RenderStyle::LayoutPositionedMovementOnly) {
......@@ -2564,7 +2564,7 @@ RenderStyle* RenderObject::firstLineStyle() const
RenderBlock* firstLineBlock = obj->firstLineBlock();
if (firstLineBlock)
s = firstLineBlock->getCachedPseudoStyle(RenderStyle::FIRST_LINE, style());
} else if (!obj->isAnonymous() && obj->isInlineFlow()) {
} else if (!obj->isAnonymous() && obj->isRenderInline()) {
RenderStyle* parentStyle = obj->parent()->firstLineStyle();
if (parentStyle != obj->parent()->style()) {
// A first-line style is in effect. We need to cache a first-line style
......
......@@ -248,7 +248,6 @@ public:
virtual bool isImage() const { return false; }
virtual bool isInlineBlockOrInlineTable() const { return false; }
virtual bool isInlineContinuation() const;
virtual bool isInlineFlow() const { return false; }
virtual bool isListBox() const { return false; }
virtual bool isListItem() const { return false; }
virtual bool isListMarker() const { return false; }
......
......@@ -45,7 +45,7 @@ InlineBox* RenderSVGInline::createInlineBox(bool unusedMakePlaceHolderBox, bool
ASSERT(!(!unusedIsRootLineBox && (isReplaced() || unusedMakePlaceHolderBox)));
ASSERT(isInlineFlow());
ASSERT(isRenderInline());
InlineFlowBox* flowBox = new (renderArena()) SVGInlineFlowBox(this);
......
......@@ -109,7 +109,7 @@ void RenderSVGText::layout()
InlineBox* RenderSVGText::createInlineBox(bool, bool, bool)
{
ASSERT(!isInlineFlow());
ASSERT(!isRenderInline());
InlineFlowBox* flowBox = new (renderArena()) SVGRootInlineBox(this);
if (!m_firstLineBox)
......
......@@ -182,7 +182,7 @@ bool RenderTableRow::nodeAtPoint(const HitTestRequest& request, HitTestResult& r
// at the moment (a demoted inline <form> for example). If we ever implement a
// table-specific hit-test method (which we should do for performance reasons anyway),
// then we can remove this check.
if (!child->hasLayer() && !child->isInlineFlow() && child->nodeAtPoint(request, result, x, y, tx, ty, action)) {
if (!child->hasLayer() && !child->isRenderInline() && child->nodeAtPoint(request, result, x, y, tx, ty, action)) {
updateHitTestResult(result, IntPoint(x - tx, y - ty));
return true;
}
......
......@@ -1086,7 +1086,7 @@ bool RenderTableSection::nodeAtPoint(const HitTestRequest& request, HitTestResul
// at the moment (a demoted inline <form> for example). If we ever implement a
// table-specific hit-test method (which we should do for performance reasons anyway),
// then we can remove this check.
if (!child->hasLayer() && !child->isInlineFlow() && child->nodeAtPoint(request, result, xPos, yPos, tx, ty, action)) {
if (!child->hasLayer() && !child->isRenderInline() && child->nodeAtPoint(request, result, xPos, yPos, tx, ty, action)) {
updateHitTestResult(result, IntPoint(xPos - tx, yPos - ty));
return true;
}
......
......@@ -854,7 +854,7 @@ void RenderText::setTextWithOffset(PassRefPtr<StringImpl> text, unsigned offset,
static inline bool isInlineFlowOrEmptyText(RenderObject* o)
{
if (o->isInlineFlow())
if (o->isRenderInline())
return true;
if (!o->isText())
return false;
......
......@@ -193,7 +193,7 @@ static TextStream &operator<<(TextStream& ts, const RenderObject& o)
if (adjustForTableCells && !text.firstTextBox())
adjustForTableCells = false;
} else if (o.isBox()) {
if (o.isInlineFlow()) {
if (o.isRenderInline()) {
// FIXME: Would be better not to just dump 0, 0 as the x and y here.
const RenderFlow& inlineFlow = static_cast<const RenderFlow&>(o);
r = IntRect(0, 0, inlineFlow.linesBoundingBox().width(), inlineFlow.linesBoundingBox().height());
......
......@@ -174,7 +174,7 @@ static inline RenderObject* bidiNext(RenderBlock* block, RenderObject* current,
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 @@ static inline RenderObject* bidiNext(RenderBlock* block, RenderObject* current,
}
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 @@ static inline RenderObject* bidiNext(RenderBlock* block, RenderObject* current,
}
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 @@ static inline RenderObject* bidiNext(RenderBlock* block, RenderObject* current,
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 @@ static RenderObject* bidiFirst(RenderBlock* block, InlineBidiResolver* resolver,
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 addMidpoint(const InlineIterator& midpoint)
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* RenderBlock::createLineBoxes(RenderObject* obj)
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 @@ void RenderBlock::computeHorizontalPositionsForLine(RootInlineBox* lineBox, Bidi
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 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintTop, i
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 @@ static bool inlineFlowRequiresLineBox(RenderBox* flow)
// 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 @@ static inline bool requiresLineBox(const InlineIterator& it)
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 @@ void RenderBlock::skipTrailingWhitespace(InlineIterator& iterator)
// FIXME: The math here is actually not really right. It's a best-guess approximation that
// will work for the common cases