Changeset 98767 in webkit
- Timestamp:
- Oct 28, 2011, 2:55:11 PM (15 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 13 edited
-
ChangeLog (modified) (1 diff)
-
rendering/RenderObject.cpp (modified) (1 diff)
-
rendering/RenderObject.h (modified) (1 diff)
-
rendering/RenderReplaced.cpp (modified) (1 diff)
-
rendering/RenderReplaced.h (modified) (1 diff)
-
rendering/RenderTableCell.cpp (modified) (1 diff)
-
rendering/RenderTableCell.h (modified) (1 diff)
-
rendering/RenderTableCol.cpp (modified) (1 diff)
-
rendering/RenderTableCol.h (modified) (1 diff)
-
rendering/RenderTableRow.cpp (modified) (2 diffs)
-
rendering/RenderTableRow.h (modified) (1 diff)
-
rendering/RenderText.cpp (modified) (1 diff)
-
rendering/RenderText.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r98766 r98767 1 2011-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 1 33 2011-10-28 Adam Klein <adamk@chromium.org> 2 34 -
trunk/Source/WebCore/rendering/RenderObject.cpp
r98748 r98767 1451 1451 } 1452 1452 1453 IntRect RenderObject::rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, int outlineWidth) const1454 { 1455 IntRect r(clippedOverflowRectForRepaint(repaintContainer));1453 LayoutRect RenderObject::rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, LayoutUnit outlineWidth) const 1454 { 1455 LayoutRect r(clippedOverflowRectForRepaint(repaintContainer)); 1456 1456 r.inflate(outlineWidth); 1457 1457 return r; 1458 1458 } 1459 1459 1460 IntRect RenderObject::clippedOverflowRectForRepaint(RenderBoxModelObject*) const1460 LayoutRect RenderObject::clippedOverflowRectForRepaint(RenderBoxModelObject*) const 1461 1461 { 1462 1462 ASSERT_NOT_REACHED(); 1463 return IntRect();1463 return LayoutRect(); 1464 1464 } 1465 1465 -
trunk/Source/WebCore/rendering/RenderObject.h
r97927 r98767 709 709 return clippedOverflowRectForRepaint(0); 710 710 } 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; 713 713 714 714 // Given a rect in the object's coordinate space, compute a rect suitable for repainting -
trunk/Source/WebCore/rendering/RenderReplaced.cpp
r98508 r98767 514 514 } 515 515 516 IntRect RenderReplaced::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const516 LayoutRect RenderReplaced::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const 517 517 { 518 518 if (style()->visibility() != VISIBLE && !enclosingLayer()->hasVisibleContent()) 519 return IntRect();519 return LayoutRect(); 520 520 521 521 // The selectionRect can project outside of the overflowRect, so take their union 522 522 // for repainting to avoid selection painting glitches. 523 IntRect r = unionRect(localSelectionRect(false), visualOverflowRect());523 LayoutRect r = unionRect(localSelectionRect(false), visualOverflowRect()); 524 524 525 525 RenderView* v = view(); -
trunk/Source/WebCore/rendering/RenderReplaced.h
r97378 r98767 77 77 virtual void paintReplaced(PaintInfo&, const LayoutPoint&) { } 78 78 79 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;79 virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const; 80 80 81 81 virtual VisiblePosition positionForPoint(const LayoutPoint&); -
trunk/Source/WebCore/rendering/RenderTableCell.cpp
r98676 r98767 237 237 } 238 238 239 IntRect RenderTableCell::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const239 LayoutRect RenderTableCell::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const 240 240 { 241 241 // If the table grid is dirty, we cannot get reliable information about adjoining cells, -
trunk/Source/WebCore/rendering/RenderTableCell.h
r98676 r98767 155 155 156 156 virtual LayoutSize offsetFromContainer(RenderObject*, const LayoutPoint&) const; 157 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;157 virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const; 158 158 virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false) const; 159 159 -
trunk/Source/WebCore/rendering/RenderTableCol.cpp
r95852 r98767 82 82 } 83 83 84 IntRect RenderTableCol::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const84 LayoutRect RenderTableCol::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const 85 85 { 86 86 // For now, just repaint the whole table. -
trunk/Source/WebCore/rendering/RenderTableCol.h
r95852 r98767 57 57 virtual bool requiresLayer() const { return false; } 58 58 59 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;59 virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const; 60 60 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0); 61 61 -
trunk/Source/WebCore/rendering/RenderTableRow.cpp
r98372 r98767 185 185 } 186 186 187 IntRect RenderTableRow::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const187 LayoutRect RenderTableRow::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const 188 188 { 189 189 ASSERT(parent()); … … 199 199 return parentTable->clippedOverflowRectForRepaint(repaintContainer); 200 200 201 return IntRect();201 return LayoutRect(); 202 202 } 203 203 -
trunk/Source/WebCore/rendering/RenderTableRow.h
r92252 r98767 54 54 virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0); 55 55 virtual void layout(); 56 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;56 virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const; 57 57 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset, HitTestAction); 58 58 -
trunk/Source/WebCore/rendering/RenderText.cpp
r96987 r98767 1521 1521 } 1522 1522 1523 IntRect RenderText::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const1523 LayoutRect RenderText::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const 1524 1524 { 1525 1525 RenderObject* rendererToRepaint = containingBlock(); -
trunk/Source/WebCore/rendering/RenderText.h
r96987 r98767 101 101 virtual LayoutUnit marginRight() const { return style()->marginRight().calcMinValue(0); } 102 102 103 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;103 virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const; 104 104 105 105 InlineTextBox* firstTextBox() const { return m_firstTextBox; }
Note:
See TracChangeset
for help on using the changeset viewer.