⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 88198 in webkit


Ignore:
Timestamp:
Jun 6, 2011, 4:01:25 PM (15 years ago)
Author:
eae@chromium.org
Message:

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

Reviewed by Eric Seidel.

Convert RenderBox::pushContentsClip to IntPoint
​https://bugs.webkit.org/show_bug.cgi?id=62133

Covered by existing tests.

  • rendering/RenderBlock.cpp: (WebCore::Covered by existing tests.RenderBlock::paint):
  • rendering/RenderBox.cpp: (WebCore::RenderBox::pushContentsClip):
  • rendering/RenderBox.h:
  • rendering/RenderTable.cpp: (WebCore::RenderTable::paint):
  • rendering/RenderTableSection.cpp: (WebCore::RenderTableSection::paint):
Location:
trunk/Source/WebCore
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r88196 r88198  
     12011-06-06  Emil A Eklund  <eae@chromium.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Convert RenderBox::pushContentsClip to IntPoint
     6        https://bugs.webkit.org/show_bug.cgi?id=62133
     7
     8        Covered by existing tests.
     9
     10        * rendering/RenderBlock.cpp:
     11        (WebCore::Covered by existing tests.RenderBlock::paint):
     12        * rendering/RenderBox.cpp:
     13        (WebCore::RenderBox::pushContentsClip):
     14        * rendering/RenderBox.h:
     15        * rendering/RenderTable.cpp:
     16        (WebCore::RenderTable::paint):
     17        * rendering/RenderTableSection.cpp:
     18        (WebCore::RenderTableSection::paint):
     19
    1202011-06-06  Levi Weintraub  <leviw@chromium.org>
    221

  • trunk/Source/WebCore/rendering/RenderBlock.cpp

    r88195 r88198  
    22582258    }
    22592259
    2260     bool pushedClip = pushContentsClip(paintInfo, tx, ty);
     2260    bool pushedClip = pushContentsClip(paintInfo, IntPoint(tx, ty));
    22612261    paintObject(paintInfo, IntPoint(tx, ty));
    22622262    if (pushedClip)

  • trunk/Source/WebCore/rendering/RenderBox.cpp

    r88189 r88198  
    10971097#endif
    10981098
    1099 bool RenderBox::pushContentsClip(PaintInfo& paintInfo, int tx, int ty)
     1099bool RenderBox::pushContentsClip(PaintInfo& paintInfo, const IntPoint& accumulatedOffset)
    11001100{
    11011101    if (paintInfo.phase == PaintPhaseBlockBackground || paintInfo.phase == PaintPhaseSelfOutline || paintInfo.phase == PaintPhaseMask)
    … …  
    11121112    else if (paintInfo.phase == PaintPhaseChildBlockBackground) {
    11131113        paintInfo.phase = PaintPhaseBlockBackground;
    1114         paintObject(paintInfo, IntPoint(tx, ty));
     1114        paintObject(paintInfo, accumulatedOffset);
    11151115        paintInfo.phase = PaintPhaseChildBlockBackgrounds;
    11161116    }
    1117     IntRect clipRect(isControlClip ? controlClipRect(IntPoint(tx, ty)) : overflowClipRect(IntPoint(tx, ty)));
     1117    IntRect clipRect(isControlClip ? controlClipRect(accumulatedOffset) : overflowClipRect(accumulatedOffset));
    11181118    paintInfo.context->save();
    11191119    if (style()->hasBorderRadius())
    1120         paintInfo.context->addRoundedRectClip(style()->getRoundedBorderFor(IntRect(tx, ty, width(), height())));
     1120        paintInfo.context->addRoundedRectClip(style()->getRoundedBorderFor(IntRect(accumulatedOffset, size())));
    11211121    paintInfo.context->clip(clipRect);
    11221122    return true;

  • trunk/Source/WebCore/rendering/RenderBox.h

    r88189 r88198  
    350350    virtual bool hasControlClip() const { return false; }
    351351    virtual IntRect controlClipRect(const IntPoint&) const { return IntRect(); }
    352     bool pushContentsClip(PaintInfo&, int tx, int ty);
     352    bool pushContentsClip(PaintInfo&, const IntPoint& accumulatedOffset);
    353353    void popContentsClip(PaintInfo&, PaintPhase originalPhase, const IntPoint& accumulatedOffset);
    354354

  • trunk/Source/WebCore/rendering/RenderTable.cpp

    r88189 r88198  
    468468    }
    469469
    470     bool pushedClip = pushContentsClip(paintInfo, tx, ty);   
     470    bool pushedClip = pushContentsClip(paintInfo, IntPoint(tx, ty));
    471471    paintObject(paintInfo, IntPoint(tx, ty));
    472472    if (pushedClip)

  • trunk/Source/WebCore/rendering/RenderTableSection.cpp

    r88189 r88198  
    904904
    905905    PaintPhase phase = paintInfo.phase;
    906     bool pushedClip = pushContentsClip(paintInfo, tx, ty);
     906    bool pushedClip = pushContentsClip(paintInfo, IntPoint(tx, ty));
    907907    paintObject(paintInfo, IntPoint(tx, ty));
    908908    if (pushedClip)
Note: See TracChangeset for help on using the changeset viewer.