ChangeLog

2011-06-03  Emil A Eklund  <eae@chromium.org>

        Reviewed by NOBODY (OOPS!).

        Convert RenderBox::clipRect to IntPoint

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

        Covered by existing tests.

        * platform/graphics/IntRect.h:

        (WebCore::IntRect::contract):

        * rendering/RenderBox.cpp:

        (WebCore::RenderBox::clipRect):

        * rendering/RenderBox.h:

        * rendering/RenderLayer.cpp:

        (WebCore::RenderLayer::calculateClipRects):

        (WebCore::RenderLayer::calculateRects):

        (WebCore::RenderLayer::repaintBlockSelectionGaps):

        * rendering/RenderLayerBacking.cpp:

        (WebCore::clipBox):

2011-06-03  Alexis Menard  <alexis.menard@openbossa.org>

        Reviewed by Andreas Kling.

88046

Source/WebCore/platform/graphics/IntRect.h

@@public:

    void expand(const IntSize& size) { m_location += size; }

    void expand(int dw, int dh) { m_size.expand(dw, dh); }

116 void contract(int dw, int dh) { m_size.expand(-dw, -dh); }

    void shiftXEdgeTo(int edge)

    {

87865

Source/WebCore/rendering/RenderBox.cpp

@@IntRect RenderBox::overflowClipRect(int

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

}

1162 IntRect RenderBox::clipRect(int ~~tx,~~ i~~nt ty~~)

1162IntRect RenderBox::clipRect(const IntPoint& location)

11631163{

    int clipX = tx;

    int clipY = ty;

    int clipWidth = width();

    int clipHeight = height();

1164 IntRect clipRect(location, size());

11691165 if (!style()->clipLeft().isAuto()) {

11701166 int c = style()->clipLeft().calcValue(width());

1171 clipX ~~+= c~~;

1172 clip~~Wid~~th ~~-= c~~;

1167 clipRect.move(c, 0);

1168 clipRect.contract(c, 0);

    }

    if (!style()->clipRight().isAuto())

1176 clip~~Width -=~~ width() - style()->clipRight().calcValue(width());

1172 clipRect.contract(width() - style()->clipRight().calcValue(width()), 0);

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

        int c = style()->clipTop().calcValue(height());

1180 clip~~Y +=~~ c;

1181 clipH~~eight -=~~ c;

1176 clipRect.move(0, c);

1177 clipRect.contract(0, c);

    }

    if (!style()->clipBottom().isAuto())

1185 clipH~~eight -=~~ height() - style()->clipBottom().calcValue(height());

1181 clipRect.contract(0, height() - style()->clipBottom().calcValue(height()));

11861182

1187 return ~~Int~~Rect~~(clipX, clipY, clipWidth, clipHeight)~~;

1183 return clipRect;

}

int RenderBox::containingBlockLogicalWidthForContent() const

87865

Source/WebCore/rendering/RenderBox.h

@@public:

    virtual IntRect localCaretRect(InlineBox*, int caretOffset, int* extraWidthToEndOfLine = 0);

    virtual IntRect overflowClipRect(int tx, int ty, OverlayScrollbarSizeRelevancy relevancy = IgnoreOverlayScrollbarSize);

349 IntRect clipRect(int ~~tx,~~ i~~nt ty~~);

349 IntRect clipRect(const IntPoint& location);

    virtual bool hasControlClip() const { return false; }

    virtual IntRect controlClipRect(const IntPoint&) const { return IntRect(); }

    bool pushContentsClip(PaintInfo&, int tx, int ty);

87865

Source/WebCore/rendering/RenderLayer.cpp

@@void RenderLayer::calculateClipRects(con

                clipRects.setPosClipRect(intersection(newOverflowClip, clipRects.posClipRect()));

        }

        if (renderer()->hasClip()) {

3397 IntRect newPosClip = toRenderBox(renderer())->clipRect(x, y);

3397 IntRect newPosClip = toRenderBox(renderer())->clipRect(IntPoint(x, y));

            clipRects.setPosClipRect(intersection(newPosClip, clipRects.posClipRect()));

            clipRects.setOverflowClipRect(intersection(newPosClip, clipRects.overflowClipRect()));

            clipRects.setFixedClipRect(intersection(newPosClip, clipRects.fixedClipRect()));

@@void RenderLayer::calculateRects(const R

            foregroundRect.intersect(toRenderBox(renderer())->overflowClipRect(x, y, relevancy));

        if (renderer()->hasClip()) {

            // Clip applies to *us* as well, so go ahead and update the damageRect.

3459 IntRect newPosClip = toRenderBox(renderer())->clipRect(x, y);

3459 IntRect newPosClip = toRenderBox(renderer())->clipRect(IntPoint(x, y));

            backgroundRect.intersect(newPosClip);

            foregroundRect.intersect(newPosClip);

            outlineRect.intersect(newPosClip);

@@void RenderLayer::repaintBlockSelectionG

    if (renderer()->hasOverflowClip())

        rect.intersect(toRenderBox(renderer())->overflowClipRect(0, 0));

    if (renderer()->hasClip())

3530 rect.intersect(toRenderBox(renderer())->clipRect(~~0, 0~~));

3530 rect.intersect(toRenderBox(renderer())->clipRect(IntPoint()));

    if (!rect.isEmpty())

        renderer()->repaintRectangle(rect);

}

87865

Source/WebCore/rendering/RenderLayerBacking.cpp

@@static IntRect clipBox(RenderBox* render

        result = renderer->overflowClipRect(0, 0);

    if (renderer->hasClip())

323 result.intersect(renderer->clipRect(~~0, 0~~));

323 result.intersect(renderer->clipRect(IntPoint()));

    return result;

}

87865