WebCore/ChangeLog

2010-09-24  David Hyatt  <hyatt@apple.com>

        Reviewed by NOBODY (OOPS!).

        https://bugs.webkit.org/show_bug.cgi?id=46496, rename containingBlockWidthForContent to

        containingBlockLogicalWidthForContent.

        * rendering/RenderBlock.cpp:

        (WebCore::RenderBlock::localCaretRect):

        * rendering/RenderBox.cpp:

        (WebCore::RenderBox::containingBlockLogicalWidthForContent):

        (WebCore::RenderBox::computeLogicalWidth):

        (WebCore::RenderBox::computeReplacedWidthUsing):

        * rendering/RenderBox.h:

        * rendering/RenderBoxModelObject.cpp:

        (WebCore::RenderBoxModelObject::relativePositionOffsetX):

        (WebCore::RenderBoxModelObject::containingBlockLogicalWidthForContent):

        * rendering/RenderBoxModelObject.h:

2010-09-24  David Hyatt  <hyatt@apple.com>

        Reviewed by Sam Weinig.

68282

WebCore/rendering/RenderBlock.cpp

@@IntRect RenderBlock::localCaretRect(Inli

            // FIXME: why call localToAbsoluteForContent() twice here, too?

            FloatPoint absRightPoint = localToAbsolute(FloatPoint(myRight, 0));

5784 int containerRight = containingBlock()->x() + containingBlockWidthForContent();

5784 int containerRight = containingBlock()->x() + containingBlockLogicalWidthForContent();

            FloatPoint absContainerPoint = localToAbsolute(FloatPoint(containerRight, 0));

            *extraWidthToEndOfLine = absContainerPoint.x() - absRightPoint.x();

68282

WebCore/rendering/RenderBox.cpp

@@IntRect RenderBox::clipRect(int tx, int

    return IntRect(clipX, clipY, clipWidth, clipHeight);

}

1038 int RenderBox::containingBlockWidthForContent() const

1038int RenderBox::containingBlockLogicalWidthForContent() const

{

    RenderBlock* cb = containingBlock();

    if (shrinkToAvoidFloats())

        return cb->availableLogicalWidthForLine(y(), false);

1043 return cb->availableWidth();

1043 return cb->availableLogicalWidth();

}

void RenderBox::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState) const

@@void RenderBox::computeLogicalWidth()

    // The parent box is flexing us, so it has increased or decreased our

    // width.  Use the width from the style context.

1363 // FIXME: Account for block-flow in flexible boxes.

1364 // https://bugs.webkit.org/show_bug.cgi?id=46418

    if (hasOverrideSize() &&  parent()->style()->boxOrient() == HORIZONTAL

            && parent()->isFlexibleBox() && parent()->isFlexingChildren()) {

        setWidth(overrideSize());

        return;

    }

1371 // FIXME: Account for block-flow in flexible boxes.

1372 // https://bugs.webkit.org/show_bug.cgi?id=46418

    bool inVerticalBox = parent()->isFlexibleBox() && (parent()->style()->boxOrient() == VERTICAL);

    bool stretching = (parent()->style()->boxAlign() == BSTRETCH);

    bool treatAsReplaced = shouldComputeSizeAsReplaced() && (!inVerticalBox || !stretching);

@@void RenderBox::computeLogicalWidth()

    Length w = (treatAsReplaced) ? Length(computeReplacedWidth(), Fixed) : style()->width();

    RenderBlock* cb = containingBlock();

1376 int containerWidth = max(0, containingBlockWidthForContent());

1380 int containerWidth = max(0, containingBlockLogicalWidthForContent());

    Length marginLeft = style()->marginLeft();

    Length marginRight = style()->marginRight();

@@int RenderBox::computeReplacedWidthUsing

        case Fixed:

            return computeContentBoxLogicalWidth(width.value());

        case Percent: {

1727 const int cw = isPositioned() ? containingBlockWidthForPositioned(toRenderBoxModelObject(container())) : containingBlockWidthForContent();

            // FIXME: containingBlockLogicalWidthForContent() is wrong if the replaced element's block-flow is perpendicular to the

            // containing block's block-flow.

            // https://bugs.webkit.org/show_bug.cgi?id=46496

            const int cw = isPositioned() ? containingBlockWidthForPositioned(toRenderBoxModelObject(container())) : containingBlockLogicalWidthForContent();

            if (cw > 0)

                return computeContentBoxLogicalWidth(width.calcMinValue(cw));

        }

68282

WebCore/rendering/RenderBox.h

@@public:

    virtual void repaintDuringLayoutIfMoved(const IntRect&);

222 virtual int containingBlockWidthForContent() const;

222 virtual int containingBlockLogicalWidthForContent() const;

    virtual void computeLogicalWidth();

    virtual void computeLogicalHeight();

68276

WebCore/rendering/RenderBoxModelObject.cpp

@@int RenderBoxModelObject::relativePositi

{

    // Objects that shrink to avoid floats normally use available line width when computing containing block width.  However

    // in the case of relative positioning using percentages, we can't do this.  The offset should always be resolved using the

323 // available width of the containing block. Therefore we don't use containingBlockWidthForContent() here, but instead explicitly

323 // available width of the containing block. Therefore we don't use containingBlockLogicalWidthForContent() here, but instead explicitly

    // call availableWidth on our containing block.

    if (!style()->left().isAuto()) {

        RenderBlock* cb = containingBlock();

@@void RenderBoxModelObject::paintBoxShado

    }

}

1784 int RenderBoxModelObject::containingBlockWidthForContent() const

1784int RenderBoxModelObject::containingBlockLogicalWidthForContent() const

17851785{

1786 return containingBlock()->availableWidth();

1786 return containingBlock()->availableLogicalWidth();

}

} // namespace WebCore

68200

WebCore/rendering/RenderBoxModelObject.h

@@public:

    bool hasHorizontalBordersPaddingOrMargin() const { return hasHorizontalBordersOrPadding() || marginLeft() != 0 || marginRight() != 0; }

    bool hasHorizontalBordersOrPadding() const { return borderLeft() != 0 || borderRight() != 0 || paddingLeft() != 0 || paddingRight() != 0; }

104 virtual int containingBlockWidthForContent() const;

104 virtual int containingBlockLogicalWidthForContent() const;

    virtual void childBecameNonInline(RenderObject* /*child*/) { }

68174