| Index: Source/core/layout/LayoutBox.cpp
|
| diff --git a/Source/core/layout/LayoutBox.cpp b/Source/core/layout/LayoutBox.cpp
|
| index 20aca77f26ceaab7599f6bade59be3bdd749f70e..9282326e524c5ec22434ded31695d593afb495f2 100644
|
| --- a/Source/core/layout/LayoutBox.cpp
|
| +++ b/Source/core/layout/LayoutBox.cpp
|
| @@ -1246,8 +1246,8 @@ bool LayoutBox::foregroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect, u
|
| if (!isCandidateForOpaquenessTest(*childBox))
|
| continue;
|
| LayoutPoint childLocation = childBox->location();
|
| - if (childBox->isRelPositioned())
|
| - childLocation.move(childBox->relativePositionOffset());
|
| + if (childBox->isInFlowPositioned())
|
| + childLocation.move(childBox->offsetForInFlowPosition());
|
| LayoutRect childLocalRect = localRect;
|
| childLocalRect.moveBy(-childLocation);
|
| if (childLocalRect.y() < 0 || childLocalRect.x() < 0) {
|
| @@ -1614,7 +1614,7 @@ LayoutSize LayoutBox::offsetFromContainer(const LayoutObject* o, const LayoutPoi
|
| ASSERT(o == container());
|
|
|
| LayoutSize offset;
|
| - if (isRelPositioned())
|
| + if (isInFlowPositioned())
|
| offset += offsetForInFlowPosition();
|
|
|
| if (!isInline() || isReplaced()) {
|
| @@ -1633,7 +1633,7 @@ LayoutSize LayoutBox::offsetFromContainer(const LayoutObject* o, const LayoutPoi
|
| if (o->hasOverflowClip())
|
| offset -= toLayoutBox(o)->scrolledContentOffset();
|
|
|
| - if (style()->position() == AbsolutePosition && o->isRelPositioned() && o->isLayoutInline())
|
| + if (style()->position() == AbsolutePosition && o->isInFlowPositioned() && o->isLayoutInline())
|
| offset += toLayoutInline(o)->offsetForInFlowPositionedInline(*this);
|
|
|
| return offset;
|
| @@ -1692,7 +1692,7 @@ void LayoutBox::positionLineBox(InlineBox* box)
|
|
|
| void LayoutBox::moveWithEdgeOfInlineContainerIfNecessary(bool isHorizontal)
|
| {
|
| - ASSERT(isOutOfFlowPositioned() && container()->isLayoutInline() && container()->isRelPositioned());
|
| + ASSERT(isOutOfFlowPositioned() && container()->isLayoutInline() && container()->isInFlowPositioned());
|
| // If this object is inside a relative positioned inline and its inline position is an explicit offset from the edge of its container
|
| // then it will need to move if its inline container has changed width. We do not track if the width has changed
|
| // but if we are here then we are laying out lines inside it, so it probably has - mark our object for layout so that it can
|
| @@ -1798,7 +1798,7 @@ void LayoutBox::mapRectToPaintInvalidationBacking(const LayoutBoxModelObject* pa
|
| topLeft.move(locationOffset());
|
| }
|
|
|
| - if (position == AbsolutePosition && o->isRelPositioned() && o->isLayoutInline()) {
|
| + if (position == AbsolutePosition && o->isInFlowPositioned() && o->isLayoutInline()) {
|
| topLeft += toLayoutInline(o)->offsetForInFlowPositionedInline(*this);
|
| } else if (styleToUse.hasInFlowPosition() && layer()) {
|
| // Apply the relative position offset when invalidating a rectangle. The layer
|
| @@ -2720,7 +2720,7 @@ LayoutUnit LayoutBox::containingBlockLogicalWidthForPositioned(const LayoutBoxMo
|
| if (containingBlock->isBox())
|
| return toLayoutBox(containingBlock)->clientLogicalWidth();
|
|
|
| - ASSERT(containingBlock->isLayoutInline() && containingBlock->isRelPositioned());
|
| + ASSERT(containingBlock->isLayoutInline() && containingBlock->isInFlowPositioned());
|
|
|
| const LayoutInline* flow = toLayoutInline(containingBlock);
|
| InlineFlowBox* first = flow->firstLineBox();
|
| @@ -2766,7 +2766,7 @@ LayoutUnit LayoutBox::containingBlockLogicalHeightForPositioned(const LayoutBoxM
|
| return cb->clientLogicalHeight();
|
| }
|
|
|
| - ASSERT(containingBlock->isLayoutInline() && containingBlock->isRelPositioned());
|
| + ASSERT(containingBlock->isLayoutInline() && containingBlock->isInFlowPositioned());
|
|
|
| const LayoutInline* flow = toLayoutInline(containingBlock);
|
| InlineFlowBox* first = flow->firstLineBox();
|
| @@ -2797,10 +2797,10 @@ static void computeInlineStaticDistance(Length& logicalLeft, Length& logicalRigh
|
| for (LayoutObject* curr = child->parent(); curr && curr != containerBlock; curr = curr->container()) {
|
| if (curr->isBox()) {
|
| staticPosition += toLayoutBox(curr)->logicalLeft();
|
| - if (toLayoutBox(curr)->isRelPositioned())
|
| - staticPosition += toLayoutBox(curr)->relativePositionOffset().width();
|
| + if (toLayoutBox(curr)->isInFlowPositioned())
|
| + staticPosition += toLayoutBox(curr)->offsetForInFlowPosition().width();
|
| } else if (curr->isInline()) {
|
| - if (curr->isRelPositioned()) {
|
| + if (curr->isInFlowPositioned()) {
|
| if (!curr->style()->logicalLeft().isAuto())
|
| staticPosition += valueForLength(curr->style()->logicalLeft(), curr->containingBlock()->availableWidth());
|
| else
|
| @@ -2816,13 +2816,13 @@ static void computeInlineStaticDistance(Length& logicalLeft, Length& logicalRigh
|
| if (curr->isBox()) {
|
| if (curr != containerBlock) {
|
| staticPosition -= toLayoutBox(curr)->logicalLeft();
|
| - if (toLayoutBox(curr)->isRelPositioned())
|
| - staticPosition -= toLayoutBox(curr)->relativePositionOffset().width();
|
| + if (toLayoutBox(curr)->isInFlowPositioned())
|
| + staticPosition -= toLayoutBox(curr)->offsetForInFlowPosition().width();
|
| }
|
| if (curr == enclosingBox)
|
| staticPosition -= enclosingBox->logicalWidth();
|
| } else if (curr->isInline()) {
|
| - if (curr->isRelPositioned()) {
|
| + if (curr->isInFlowPositioned()) {
|
| if (!curr->style()->logicalLeft().isAuto())
|
| staticPosition -= valueForLength(curr->style()->logicalLeft(), curr->containingBlock()->availableWidth());
|
| else
|
| @@ -4403,7 +4403,7 @@ LayoutRect LayoutBox::layoutOverflowRectForPropagation(const ComputedStyle& pare
|
| rect.unite(layoutOverflowRect());
|
|
|
| bool hasTransform = hasLayer() && layer()->transform();
|
| - if (isRelPositioned() || hasTransform) {
|
| + if (isInFlowPositioned() || hasTransform) {
|
| // If we are relatively positioned or if we have a transform, then we have to convert
|
| // this rectangle into physical coordinates, apply relative positioning and transforms
|
| // to it, and then convert it back.
|
| @@ -4412,7 +4412,7 @@ LayoutRect LayoutBox::layoutOverflowRectForPropagation(const ComputedStyle& pare
|
| if (hasTransform)
|
| rect = layer()->currentTransform().mapRect(rect);
|
|
|
| - if (isRelPositioned())
|
| + if (isInFlowPositioned())
|
| rect.move(offsetForInFlowPosition());
|
|
|
| // Now we need to flip back.
|
|
|