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

Changeset 98767 in webkit


Ignore:
Timestamp:
Oct 28, 2011, 2:55:11 PM (15 years ago)
Author:
eae@chromium.org
Message:

Overridden clippedOverflowRectForRepaint() still uses IntRects
https://bugs.webkit.org/show_bug.cgi?id=71046

Reviewed by Simon Fraser.

Change all virtual clippedOverflowRectForRepaint functions to use the
same signature.

No new tests.

  • rendering/RenderObject.cpp:

(WebCore::RenderObject::rectWithOutlineForRepaint):
(WebCore::RenderObject::clippedOverflowRectForRepaint):

  • rendering/RenderObject.h:
  • rendering/RenderReplaced.cpp:

(WebCore::RenderReplaced::clippedOverflowRectForRepaint):

  • rendering/RenderReplaced.h:
  • rendering/RenderTableCell.cpp:

(WebCore::RenderTableCell::clippedOverflowRectForRepaint):

  • rendering/RenderTableCell.h:
  • rendering/RenderTableCol.cpp:

(WebCore::RenderTableCol::clippedOverflowRectForRepaint):

  • rendering/RenderTableCol.h:
  • rendering/RenderTableRow.cpp:

(WebCore::RenderTableRow::clippedOverflowRectForRepaint):

  • rendering/RenderTableRow.h:
  • rendering/RenderText.cpp:

(WebCore::RenderText::clippedOverflowRectForRepaint):

  • rendering/RenderText.h:
Location:
trunk/Source/WebCore
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r98766 r98767  
     12011-10-28  Emil A Eklund  <eae@chromium.org>
     2
     3        Overridden clippedOverflowRectForRepaint() still uses IntRects
     4        https://bugs.webkit.org/show_bug.cgi?id=71046
     5
     6        Reviewed by Simon Fraser.
     7
     8        Change all virtual clippedOverflowRectForRepaint functions to use the
     9        same signature.
     10
     11        No new tests.
     12
     13        * rendering/RenderObject.cpp:
     14        (WebCore::RenderObject::rectWithOutlineForRepaint):
     15        (WebCore::RenderObject::clippedOverflowRectForRepaint):
     16        * rendering/RenderObject.h:
     17        * rendering/RenderReplaced.cpp:
     18        (WebCore::RenderReplaced::clippedOverflowRectForRepaint):
     19        * rendering/RenderReplaced.h:
     20        * rendering/RenderTableCell.cpp:
     21        (WebCore::RenderTableCell::clippedOverflowRectForRepaint):
     22        * rendering/RenderTableCell.h:
     23        * rendering/RenderTableCol.cpp:
     24        (WebCore::RenderTableCol::clippedOverflowRectForRepaint):
     25        * rendering/RenderTableCol.h:
     26        * rendering/RenderTableRow.cpp:
     27        (WebCore::RenderTableRow::clippedOverflowRectForRepaint):
     28        * rendering/RenderTableRow.h:
     29        * rendering/RenderText.cpp:
     30        (WebCore::RenderText::clippedOverflowRectForRepaint):
     31        * rendering/RenderText.h:
     32
    1332011-10-28  Adam Klein  <adamk@chromium.org>
    234
  • trunk/Source/WebCore/rendering/RenderObject.cpp

    r98748 r98767  
    14511451}
    14521452
    1453 IntRect RenderObject::rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, int outlineWidth) const
    1454 {
    1455     IntRect r(clippedOverflowRectForRepaint(repaintContainer));
     1453LayoutRect RenderObject::rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, LayoutUnit outlineWidth) const
     1454{
     1455    LayoutRect r(clippedOverflowRectForRepaint(repaintContainer));
    14561456    r.inflate(outlineWidth);
    14571457    return r;
    14581458}
    14591459
    1460 IntRect RenderObject::clippedOverflowRectForRepaint(RenderBoxModelObject*) const
     1460LayoutRect RenderObject::clippedOverflowRectForRepaint(RenderBoxModelObject*) const
    14611461{
    14621462    ASSERT_NOT_REACHED();
    1463     return IntRect();
     1463    return LayoutRect();
    14641464}
    14651465
  • trunk/Source/WebCore/rendering/RenderObject.h

    r97927 r98767  
    709709        return clippedOverflowRectForRepaint(0);
    710710    }
    711     virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
    712     virtual IntRect rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, int outlineWidth) const;
     711    virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
     712    virtual LayoutRect rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, LayoutUnit outlineWidth) const;
    713713
    714714    // Given a rect in the object's coordinate space, compute a rect suitable for repainting
  • trunk/Source/WebCore/rendering/RenderReplaced.cpp

    r98508 r98767  
    514514}
    515515
    516 IntRect RenderReplaced::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const
     516LayoutRect RenderReplaced::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const
    517517{
    518518    if (style()->visibility() != VISIBLE && !enclosingLayer()->hasVisibleContent())
    519         return IntRect();
     519        return LayoutRect();
    520520
    521521    // The selectionRect can project outside of the overflowRect, so take their union
    522522    // for repainting to avoid selection painting glitches.
    523     IntRect r = unionRect(localSelectionRect(false), visualOverflowRect());
     523    LayoutRect r = unionRect(localSelectionRect(false), visualOverflowRect());
    524524
    525525    RenderView* v = view();
  • trunk/Source/WebCore/rendering/RenderReplaced.h

    r97378 r98767  
    7777    virtual void paintReplaced(PaintInfo&, const LayoutPoint&) { }
    7878
    79     virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
     79    virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
    8080
    8181    virtual VisiblePosition positionForPoint(const LayoutPoint&);
  • trunk/Source/WebCore/rendering/RenderTableCell.cpp

    r98676 r98767  
    237237}
    238238
    239 IntRect RenderTableCell::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const
     239LayoutRect RenderTableCell::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const
    240240{
    241241    // If the table grid is dirty, we cannot get reliable information about adjoining cells,
  • trunk/Source/WebCore/rendering/RenderTableCell.h

    r98676 r98767  
    155155
    156156    virtual LayoutSize offsetFromContainer(RenderObject*, const LayoutPoint&) const;
    157     virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
     157    virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
    158158    virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false) const;
    159159
  • trunk/Source/WebCore/rendering/RenderTableCol.cpp

    r95852 r98767  
    8282}
    8383
    84 IntRect RenderTableCol::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const
     84LayoutRect RenderTableCol::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const
    8585{
    8686    // For now, just repaint the whole table.
  • trunk/Source/WebCore/rendering/RenderTableCol.h

    r95852 r98767  
    5757    virtual bool requiresLayer() const { return false; }
    5858
    59     virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
     59    virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
    6060    virtual void imageChanged(WrappedImagePtr, const IntRect* = 0);
    6161
  • trunk/Source/WebCore/rendering/RenderTableRow.cpp

    r98372 r98767  
    185185}
    186186
    187 IntRect RenderTableRow::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const
     187LayoutRect RenderTableRow::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const
    188188{
    189189    ASSERT(parent());
     
    199199        return parentTable->clippedOverflowRectForRepaint(repaintContainer);
    200200
    201     return IntRect();
     201    return LayoutRect();
    202202}
    203203
  • trunk/Source/WebCore/rendering/RenderTableRow.h

    r92252 r98767  
    5454    virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0);
    5555    virtual void layout();
    56     virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
     56    virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
    5757    virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset, HitTestAction);
    5858
  • trunk/Source/WebCore/rendering/RenderText.cpp

    r96987 r98767  
    15211521}
    15221522
    1523 IntRect RenderText::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const
     1523LayoutRect RenderText::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const
    15241524{
    15251525    RenderObject* rendererToRepaint = containingBlock();
  • trunk/Source/WebCore/rendering/RenderText.h

    r96987 r98767  
    101101    virtual LayoutUnit marginRight() const { return style()->marginRight().calcMinValue(0); }
    102102
    103     virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
     103    virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
    104104
    105105    InlineTextBox* firstTextBox() const { return m_firstTextBox; }
Note: See TracChangeset for help on using the changeset viewer.