Changeset 92252 in webkit
- Timestamp:
- Aug 2, 2011 6:58:06 PM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 35 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r92249 r92252 1 2011-08-02 Julien Chaffraix <jchaffraix@webkit.org> 2 3 RenderObject::computeRectForRepaint and clippedOverflowRectForRepaint should be const 4 https://bugs.webkit.org/show_bug.cgi?id=65494 5 6 Reviewed by Darin Adler. 7 8 No new tests, const-ness change only. 9 10 * rendering/RenderObject.h: 11 (WebCore::RenderObject::absoluteClippedOverflowRect): 12 (WebCore::RenderObject::computeAbsoluteRepaintRect): 13 Made those 2 const as they call a const method now. 14 15 * rendering/RenderInline.cpp: 16 (WebCore::RenderInline::clippedOverflowRectForRepaint): Use a const RenderObject* for iterating as 17 this is const. 18 19 * rendering/RenderBlock.cpp: 20 (WebCore::RenderBlock::rectWithOutlineForRepaint): 21 * rendering/RenderBlock.h: 22 * rendering/RenderBox.cpp: 23 (WebCore::RenderBox::clippedOverflowRectForRepaint): 24 (WebCore::RenderBox::computeRectForRepaint): 25 * rendering/RenderBox.h: 26 * rendering/RenderInline.cpp: 27 (WebCore::RenderInline::clippedOverflowRectForRepaint): 28 (WebCore::RenderInline::rectWithOutlineForRepaint): 29 (WebCore::RenderInline::computeRectForRepaint): 30 * rendering/RenderInline.h: 31 * rendering/RenderObject.cpp: 32 (WebCore::RenderObject::rectWithOutlineForRepaint): 33 (WebCore::RenderObject::clippedOverflowRectForRepaint): 34 (WebCore::RenderObject::computeRectForRepaint): 35 * rendering/RenderReplaced.cpp: 36 (WebCore::RenderReplaced::clippedOverflowRectForRepaint): 37 * rendering/RenderReplaced.h: 38 * rendering/RenderTableCell.cpp: 39 (WebCore::RenderTableCell::clippedOverflowRectForRepaint): 40 (WebCore::RenderTableCell::computeRectForRepaint): 41 * rendering/RenderTableCell.h: 42 * rendering/RenderTableCol.cpp: 43 (WebCore::RenderTableCol::clippedOverflowRectForRepaint): 44 * rendering/RenderTableCol.h: 45 * rendering/RenderTableRow.cpp: 46 (WebCore::RenderTableRow::clippedOverflowRectForRepaint): 47 * rendering/RenderTableRow.h: 48 * rendering/RenderText.cpp: 49 (WebCore::RenderText::clippedOverflowRectForRepaint): 50 * rendering/RenderText.h: 51 * rendering/RenderView.cpp: 52 (WebCore::RenderView::computeRectForRepaint): 53 * rendering/RenderView.h: 54 * rendering/svg/RenderSVGForeignObject.cpp: 55 (WebCore::RenderSVGForeignObject::clippedOverflowRectForRepaint): 56 (WebCore::RenderSVGForeignObject::computeRectForRepaint): 57 * rendering/svg/RenderSVGForeignObject.h: 58 * rendering/svg/RenderSVGGradientStop.h: 59 (WebCore::RenderSVGGradientStop::clippedOverflowRectForRepaint): 60 * rendering/svg/RenderSVGHiddenContainer.h: 61 (WebCore::RenderSVGHiddenContainer::clippedOverflowRectForRepaint): 62 * rendering/svg/RenderSVGInline.cpp: 63 (WebCore::RenderSVGInline::clippedOverflowRectForRepaint): 64 (WebCore::RenderSVGInline::computeRectForRepaint): 65 * rendering/svg/RenderSVGInline.h: 66 * rendering/svg/RenderSVGModelObject.cpp: 67 (WebCore::RenderSVGModelObject::clippedOverflowRectForRepaint): 68 (WebCore::RenderSVGModelObject::computeRectForRepaint): 69 * rendering/svg/RenderSVGModelObject.h: 70 * rendering/svg/RenderSVGRoot.cpp: 71 (WebCore::RenderSVGRoot::clippedOverflowRectForRepaint): 72 (WebCore::RenderSVGRoot::computeRectForRepaint): 73 * rendering/svg/RenderSVGRoot.h: 74 * rendering/svg/RenderSVGText.cpp: 75 (WebCore::RenderSVGText::clippedOverflowRectForRepaint): 76 (WebCore::RenderSVGText::computeRectForRepaint): 77 * rendering/svg/RenderSVGText.h: 78 * rendering/svg/SVGRenderSupport.cpp: 79 (WebCore::SVGRenderSupport::clippedOverflowRectForRepaint): 80 (WebCore::SVGRenderSupport::computeRectForRepaint): 81 * rendering/svg/SVGRenderSupport.h: 82 Updated the following method's signature to use a const object. 83 1 84 2011-08-02 Jeffrey Pfau <jpfau@apple.com> 2 85 -
trunk/Source/WebCore/rendering/RenderBlock.cpp
r92004 r92252 5829 5829 } 5830 5830 5831 IntRect RenderBlock::rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, int outlineWidth) 5831 IntRect RenderBlock::rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, int outlineWidth) const 5832 5832 { 5833 5833 IntRect r(RenderBox::rectWithOutlineForRepaint(repaintContainer, outlineWidth)); -
trunk/Source/WebCore/rendering/RenderBlock.h
r92207 r92252 626 626 virtual RenderBlock* firstLineBlock() const; 627 627 628 virtual IntRect rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, int outlineWidth) ;628 virtual IntRect rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, int outlineWidth) const; 629 629 virtual RenderStyle* outlineStyleForRepaint() const; 630 630 -
trunk/Source/WebCore/rendering/RenderBox.cpp
r92004 r92252 1380 1380 } 1381 1381 1382 IntRect RenderBox::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) 1382 IntRect RenderBox::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const 1383 1383 { 1384 1384 if (style()->visibility() != VISIBLE && !enclosingLayer()->hasVisibleContent()) … … 1411 1411 } 1412 1412 1413 void RenderBox::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& rect, bool fixed) 1413 void RenderBox::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& rect, bool fixed) const 1414 1414 { 1415 1415 // The rect we compute at each step is shifted by our x/y offset in the parent container's coordinate space. -
trunk/Source/WebCore/rendering/RenderBox.h
r92152 r92252 277 277 void deleteLineBoxWrapper(); 278 278 279 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) ;280 virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false) ;279 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const; 280 virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false) const; 281 281 282 282 virtual void repaintDuringLayoutIfMoved(const LayoutRect&); -
trunk/Source/WebCore/rendering/RenderInline.cpp
r92059 r92252 955 955 } 956 956 957 IntRect RenderInline::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) 957 IntRect RenderInline::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const 958 958 { 959 959 // Only run-ins are allowed in here during layout. … … 974 974 // containing block. 975 975 RenderBlock* cb = containingBlock(); 976 for ( RenderObject* inlineFlow = this; inlineFlow && inlineFlow->isRenderInline() && inlineFlow != cb;976 for (const RenderObject* inlineFlow = this; inlineFlow && inlineFlow->isRenderInline() && inlineFlow != cb; 977 977 inlineFlow = inlineFlow->parent()) { 978 978 if (inlineFlow->style()->position() == RelativePosition && inlineFlow->hasLayer()) … … 1018 1018 } 1019 1019 1020 IntRect RenderInline::rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, int outlineWidth) 1020 IntRect RenderInline::rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, int outlineWidth) const 1021 1021 { 1022 1022 IntRect r(RenderBoxModelObject::rectWithOutlineForRepaint(repaintContainer, outlineWidth)); … … 1028 1028 } 1029 1029 1030 void RenderInline::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& rect, bool fixed) 1030 void RenderInline::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& rect, bool fixed) const 1031 1031 { 1032 1032 if (RenderView* v = view()) { -
trunk/Source/WebCore/rendering/RenderInline.h
r90734 r92252 127 127 virtual LayoutUnit offsetHeight() const { return linesBoundingBox().height(); } 128 128 129 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) ;130 virtual IntRect rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, int outlineWidth) ;131 virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& rect, bool fixed);129 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const; 130 virtual IntRect rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, int outlineWidth) const; 131 virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed) const; 132 132 133 133 virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState&) const; -
trunk/Source/WebCore/rendering/RenderObject.cpp
r91955 r92252 1353 1353 } 1354 1354 1355 IntRect RenderObject::rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, int outlineWidth) 1355 IntRect RenderObject::rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, int outlineWidth) const 1356 1356 { 1357 1357 IntRect r(clippedOverflowRectForRepaint(repaintContainer)); … … 1360 1360 } 1361 1361 1362 IntRect RenderObject::clippedOverflowRectForRepaint(RenderBoxModelObject*) 1362 IntRect RenderObject::clippedOverflowRectForRepaint(RenderBoxModelObject*) const 1363 1363 { 1364 1364 ASSERT_NOT_REACHED(); … … 1366 1366 } 1367 1367 1368 void RenderObject::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& rect, bool fixed) 1368 void RenderObject::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& rect, bool fixed) const 1369 1369 { 1370 1370 if (repaintContainer == this) -
trunk/Source/WebCore/rendering/RenderObject.h
r91955 r92252 660 660 // Returns the rect that should be repainted whenever this object changes. The rect is in the view's 661 661 // coordinate space. This method deals with outlines and overflow. 662 IntRect absoluteClippedOverflowRect() 662 IntRect absoluteClippedOverflowRect() const 663 663 { 664 664 return clippedOverflowRectForRepaint(0); 665 665 } 666 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) ;667 virtual IntRect rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, int outlineWidth) ;666 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const; 667 virtual IntRect rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, int outlineWidth) const; 668 668 669 669 // Given a rect in the object's coordinate space, compute a rect suitable for repainting 670 670 // that rect in view coordinates. 671 void computeAbsoluteRepaintRect(IntRect& r, bool fixed = false) 671 void computeAbsoluteRepaintRect(IntRect& r, bool fixed = false) const 672 672 { 673 673 return computeRectForRepaint(0, r, fixed); … … 675 675 // Given a rect in the object's coordinate space, compute a rect suitable for repainting 676 676 // that rect in the coordinate space of repaintContainer. 677 virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false) ;677 virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false) const; 678 678 679 679 // If multiple-column layout results in applying an offset to the given point, add the same -
trunk/Source/WebCore/rendering/RenderReplaced.cpp
r91481 r92252 518 518 } 519 519 520 IntRect RenderReplaced::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) 520 IntRect RenderReplaced::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const 521 521 { 522 522 if (style()->visibility() != VISIBLE && !enclosingLayer()->hasVisibleContent()) -
trunk/Source/WebCore/rendering/RenderReplaced.h
r91242 r92252 76 76 virtual void paintReplaced(PaintInfo&, const LayoutPoint&) { } 77 77 78 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) ;78 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const; 79 79 80 80 virtual unsigned caretMaxRenderedOffset() const; -
trunk/Source/WebCore/rendering/RenderTableCell.cpp
r91417 r92252 230 230 } 231 231 232 IntRect RenderTableCell::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) 232 IntRect RenderTableCell::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const 233 233 { 234 234 // If the table grid is dirty, we cannot get reliable information about adjoining cells, … … 282 282 } 283 283 284 void RenderTableCell::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& r, bool fixed) 284 void RenderTableCell::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& r, bool fixed) const 285 285 { 286 286 if (repaintContainer == this) -
trunk/Source/WebCore/rendering/RenderTableCell.h
r91417 r92252 148 148 149 149 virtual LayoutSize offsetFromContainer(RenderObject*, const LayoutPoint&) const; 150 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) ;151 virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false) ;150 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const; 151 virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false) const; 152 152 153 153 void paintCollapsedBorder(GraphicsContext*, const LayoutRect&); -
trunk/Source/WebCore/rendering/RenderTableCol.cpp
r68276 r92252 70 70 } 71 71 72 IntRect RenderTableCol::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) 72 IntRect RenderTableCol::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const 73 73 { 74 74 // For now, just repaint the whole table. -
trunk/Source/WebCore/rendering/RenderTableCol.h
r70072 r92252 57 57 virtual bool requiresLayer() const { return false; } 58 58 59 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) ;59 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const; 60 60 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0); 61 61 -
trunk/Source/WebCore/rendering/RenderTableRow.cpp
r90675 r92252 170 170 } 171 171 172 IntRect RenderTableRow::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) 172 IntRect RenderTableRow::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const 173 173 { 174 174 ASSERT(parent()); -
trunk/Source/WebCore/rendering/RenderTableRow.h
r90675 r92252 54 54 virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0); 55 55 virtual void layout(); 56 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) ;56 virtual IntRect 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
r91763 r92252 1360 1360 } 1361 1361 1362 IntRect RenderText::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) 1362 IntRect RenderText::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const 1363 1363 { 1364 1364 RenderObject* rendererToRepaint = containingBlock(); -
trunk/Source/WebCore/rendering/RenderText.h
r90675 r92252 101 101 virtual LayoutUnit marginRight() const { return style()->marginRight().calcMinValue(0); } 102 102 103 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) ;103 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const; 104 104 105 105 InlineTextBox* firstTextBox() const { return m_firstTextBox; } -
trunk/Source/WebCore/rendering/RenderView.cpp
r91760 r92252 302 302 } 303 303 304 void RenderView::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& rect, bool fixed) 304 void RenderView::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& rect, bool fixed) const 305 305 { 306 306 // If a container was specified, and was not 0 or the RenderView, -
trunk/Source/WebCore/rendering/RenderView.h
r91760 r92252 68 68 FrameView* frameView() const { return m_frameView; } 69 69 70 virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false) ;70 virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false) const; 71 71 virtual void repaintViewRectangle(const IntRect&, bool immediate = false); 72 72 // Repaint the view, and all composited layers that intersect the given absolute rectangle. -
trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp
r90734 r92252 67 67 } 68 68 69 IntRect RenderSVGForeignObject::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) 69 IntRect RenderSVGForeignObject::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const 70 70 { 71 71 return SVGRenderSupport::clippedOverflowRectForRepaint(this, repaintContainer); 72 72 } 73 73 74 void RenderSVGForeignObject::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& repaintRect, bool fixed) 74 void RenderSVGForeignObject::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& repaintRect, bool fixed) const 75 75 { 76 76 SVGRenderSupport::computeRectForRepaint(this, repaintContainer, repaintRect, fixed); -
trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h
r90734 r92252 40 40 virtual void paint(PaintInfo&, const LayoutPoint&); 41 41 42 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) ;43 virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false) ;42 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const; 43 virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false) const; 44 44 45 45 virtual bool requiresLayer() const { return false; } -
trunk/Source/WebCore/rendering/svg/RenderSVGGradientStop.h
r75350 r92252 44 44 // RenderObject's default implementations ASSERT_NOT_REACHED() 45 45 // https://bugs.webkit.org/show_bug.cgi?id=20400 46 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject*) { return IntRect(); }46 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject*) const { return IntRect(); } 47 47 virtual FloatRect objectBoundingBox() const { return FloatRect(); } 48 48 virtual FloatRect strokeBoundingBox() const { return FloatRect(); } -
trunk/Source/WebCore/rendering/svg/RenderSVGHiddenContainer.h
r90048 r92252 44 44 virtual void paint(PaintInfo&, const LayoutPoint&); 45 45 46 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject*) { return IntRect(); }46 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject*) const { return IntRect(); } 47 47 virtual void absoluteQuads(Vector<FloatQuad>&); 48 48 -
trunk/Source/WebCore/rendering/svg/RenderSVGInline.cpp
r90734 r92252 68 68 } 69 69 70 IntRect RenderSVGInline::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) 70 IntRect RenderSVGInline::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const 71 71 { 72 72 return SVGRenderSupport::clippedOverflowRectForRepaint(this, repaintContainer); 73 73 } 74 74 75 void RenderSVGInline::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& repaintRect, bool fixed) 75 void RenderSVGInline::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& repaintRect, bool fixed) const 76 76 { 77 77 SVGRenderSupport::computeRectForRepaint(this, repaintContainer, repaintRect, fixed); -
trunk/Source/WebCore/rendering/svg/RenderSVGInline.h
r90734 r92252 46 46 virtual FloatRect repaintRectInLocalCoordinates() const; 47 47 48 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) ;49 virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false) ;48 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const; 49 virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false) const; 50 50 virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&) const; 51 51 virtual void absoluteQuads(Vector<FloatQuad>&); -
trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.cpp
r91850 r92252 44 44 } 45 45 46 IntRect RenderSVGModelObject::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) 46 IntRect RenderSVGModelObject::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const 47 47 { 48 48 return SVGRenderSupport::clippedOverflowRectForRepaint(this, repaintContainer); 49 49 } 50 50 51 void RenderSVGModelObject::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& repaintRect, bool fixed) 51 void RenderSVGModelObject::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& repaintRect, bool fixed) const 52 52 { 53 53 SVGRenderSupport::computeRectForRepaint(this, repaintContainer, repaintRect, fixed); -
trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.h
r91850 r92252 52 52 virtual bool requiresLayer() const { return false; } 53 53 54 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) ;55 virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false) ;54 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const; 55 virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false) const; 56 56 virtual IntRect outlineBoundsForRepaint(RenderBoxModelObject* repaintContainer, IntPoint*) const; 57 57 -
trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp
r90734 r92252 395 395 } 396 396 397 IntRect RenderSVGRoot::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) 397 IntRect RenderSVGRoot::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const 398 398 { 399 399 return SVGRenderSupport::clippedOverflowRectForRepaint(this, repaintContainer); 400 400 } 401 401 402 void RenderSVGRoot::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& repaintRect, bool fixed) 402 void RenderSVGRoot::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& repaintRect, bool fixed) const 403 403 { 404 404 // Apply our local transforms (except for x/y translation), then our shadow, -
trunk/Source/WebCore/rendering/svg/RenderSVGRoot.h
r90734 r92252 81 81 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset, HitTestAction); 82 82 83 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) ;84 virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& repaintRect, bool fixed) ;83 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const; 84 virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& repaintRect, bool fixed) const; 85 85 86 86 virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&) const; -
trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp
r90734 r92252 83 83 } 84 84 85 IntRect RenderSVGText::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) 85 IntRect RenderSVGText::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const 86 86 { 87 87 return SVGRenderSupport::clippedOverflowRectForRepaint(this, repaintContainer); 88 88 } 89 89 90 void RenderSVGText::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& repaintRect, bool fixed) 90 void RenderSVGText::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& repaintRect, bool fixed) const 91 91 { 92 92 SVGRenderSupport::computeRectForRepaint(this, repaintContainer, repaintRect, fixed); -
trunk/Source/WebCore/rendering/svg/RenderSVGText.h
r90734 r92252 63 63 virtual void absoluteQuads(Vector<FloatQuad>&); 64 64 65 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) ;66 virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false) ;65 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const; 66 virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false) const; 67 67 68 68 virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&) const; -
trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp
r90734 r92252 46 46 namespace WebCore { 47 47 48 IntRect SVGRenderSupport::clippedOverflowRectForRepaint( RenderObject* object, RenderBoxModelObject* repaintContainer)48 IntRect SVGRenderSupport::clippedOverflowRectForRepaint(const RenderObject* object, RenderBoxModelObject* repaintContainer) 49 49 { 50 50 // Return early for any cases where we don't actually paint … … 59 59 } 60 60 61 void SVGRenderSupport::computeRectForRepaint( RenderObject* object, RenderBoxModelObject* repaintContainer, IntRect& repaintRect, bool fixed)61 void SVGRenderSupport::computeRectForRepaint(const RenderObject* object, RenderBoxModelObject* repaintContainer, IntRect& repaintRect, bool fixed) 62 62 { 63 63 const SVGRenderStyle* svgStyle = object->style()->svgStyle(); -
trunk/Source/WebCore/rendering/svg/SVGRenderSupport.h
r90734 r92252 62 62 63 63 // Important functions used by nearly all SVG renderers centralizing coordinate transformations / repaint rect calculations 64 static IntRect clippedOverflowRectForRepaint( RenderObject*, RenderBoxModelObject* repaintContainer);65 static void computeRectForRepaint( RenderObject*, RenderBoxModelObject* repaintContainer, IntRect&, bool fixed);64 static IntRect clippedOverflowRectForRepaint(const RenderObject*, RenderBoxModelObject* repaintContainer); 65 static void computeRectForRepaint(const RenderObject*, RenderBoxModelObject* repaintContainer, IntRect&, bool fixed); 66 66 static void mapLocalToContainer(const RenderObject*, RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&); 67 67
Note: See TracChangeset
for help on using the changeset viewer.