Changeset 88250 in webkit for trunk/Source/WebCore/rendering/RenderFrameSet.cpp

Timestamp:

Jun 7, 2011, 11:56:41 AM (14 years ago)

Author:

[email protected]

Message:

2011-06-07 Levi Weintraub <​[email protected]>

Reviewed by Eric Seidel.

Switch paint to use IntPoint
​https://bugs.webkit.org/show_bug.cgi?id=62177

Flipping the switch on the remaining paint functions to have them all
use IntPoint for the paint offset instead of tx/ty.

No new tests since this is just refactoring.

• page/FrameView.cpp: (WebCore::FrameView::paintScrollCorner):
• rendering/InlineBox.cpp: (WebCore::InlineBox::paint):
• rendering/RenderBlock.cpp: (WebCore::RenderBlock::paint): (WebCore::RenderBlock::paintContents): (WebCore::RenderBlock::paintChildren): (WebCore::RenderBlock::paintFloats):
• rendering/RenderBlock.h:
• rendering/RenderBox.cpp: (WebCore::RenderBox::paint):
• rendering/RenderBox.h:
• rendering/RenderBoxModelObject.cpp: (WebCore::RenderBoxModelObject::paintFillLayerExtended):
• rendering/RenderDetailsMarker.cpp: (WebCore::RenderDetailsMarker::paint):
• rendering/RenderDetailsMarker.h:
• rendering/RenderEmbeddedObject.cpp: (WebCore::RenderEmbeddedObject::paint):
• rendering/RenderEmbeddedObject.h:
• rendering/RenderFrameSet.cpp: (WebCore::RenderFrameSet::paint):
• rendering/RenderFrameSet.h:
• rendering/RenderImage.cpp: (WebCore::RenderImage::paint):
• rendering/RenderImage.h:
• rendering/RenderInline.cpp: (WebCore::RenderInline::paint):
• rendering/RenderInline.h:
• rendering/RenderLayer.cpp: (WebCore::RenderLayer::paintScrollCorner): (WebCore::RenderLayer::paintResizer): (WebCore::RenderLayer::paintLayer):
• rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::paintIntoLayer):
• rendering/RenderLineBoxList.cpp: (WebCore::RenderLineBoxList::paint):
• rendering/RenderLineBoxList.h:
• rendering/RenderListItem.cpp: (WebCore::RenderListItem::paint):
• rendering/RenderListItem.h:
• rendering/RenderListMarker.cpp: (WebCore::RenderListMarker::paint):
• rendering/RenderListMarker.h:
• rendering/RenderObject.cpp: (WebCore::RenderObject::paint):
• rendering/RenderObject.h:
• rendering/RenderReplaced.cpp: (WebCore::RenderReplaced::paint):
• rendering/RenderReplaced.h:
• rendering/RenderReplica.cpp: (WebCore::RenderReplica::paint):
• rendering/RenderReplica.h:
• rendering/RenderScrollbar.cpp: (WebCore::RenderScrollbar::paintPart):
• rendering/RenderScrollbarPart.cpp: (WebCore::RenderScrollbarPart::paintIntoRect):
• rendering/RenderScrollbarPart.h:
• rendering/RenderTable.cpp: (WebCore::RenderTable::paint): (WebCore::RenderTable::paintObject):
• rendering/RenderTable.h:
• rendering/RenderTableCell.cpp: (WebCore::RenderTableCell::paint):
• rendering/RenderTableCell.h:
• rendering/RenderTableRow.cpp: (WebCore::RenderTableRow::paint):
• rendering/RenderTableRow.h:
• rendering/RenderTableSection.cpp: (WebCore::RenderTableSection::paint): (WebCore::RenderTableSection::paintCell):
• rendering/RenderTableSection.h:
• rendering/RenderText.h: (WebCore::RenderText::paint):
• rendering/RenderTextControlSingleLine.cpp: (WebCore::RenderTextControlSingleLine::paint):
• rendering/RenderTextControlSingleLine.h:
• rendering/RenderView.cpp: (WebCore::RenderView::paint):
• rendering/RenderView.h:
• rendering/RenderWidget.cpp: (WebCore::RenderWidget::paint):
• rendering/RenderWidget.h:
• rendering/mathml/RenderMathMLBlock.cpp: (WebCore::RenderMathMLBlock::paint):
• rendering/mathml/RenderMathMLBlock.h:
• rendering/mathml/RenderMathMLFraction.cpp: (WebCore::RenderMathMLFraction::paint):
• rendering/mathml/RenderMathMLFraction.h:
• rendering/mathml/RenderMathMLRoot.cpp: (WebCore::RenderMathMLRoot::paint):
• rendering/mathml/RenderMathMLRoot.h:
• rendering/mathml/RenderMathMLSquareRoot.cpp: (WebCore::RenderMathMLSquareRoot::paint):
• rendering/mathml/RenderMathMLSquareRoot.h:
• rendering/svg/RenderSVGContainer.cpp: (WebCore::RenderSVGContainer::paint):
• rendering/svg/RenderSVGContainer.h:
• rendering/svg/RenderSVGForeignObject.cpp: (WebCore::RenderSVGForeignObject::paint):
• rendering/svg/RenderSVGForeignObject.h:
• rendering/svg/RenderSVGHiddenContainer.cpp: (WebCore::RenderSVGHiddenContainer::paint):
• rendering/svg/RenderSVGHiddenContainer.h:
• rendering/svg/RenderSVGImage.cpp: (WebCore::RenderSVGImage::paint):
• rendering/svg/RenderSVGImage.h:
• rendering/svg/RenderSVGPath.cpp: (WebCore::RenderSVGPath::paint):
• rendering/svg/RenderSVGPath.h:
• rendering/svg/RenderSVGResourceMarker.cpp: (WebCore::RenderSVGResourceMarker::draw):
• rendering/svg/RenderSVGRoot.cpp: (WebCore::RenderSVGRoot::paint):
• rendering/svg/RenderSVGRoot.h:
• rendering/svg/RenderSVGText.cpp: (WebCore::RenderSVGText::paint):
• rendering/svg/RenderSVGText.h:
• rendering/svg/SVGImageBufferTools.cpp: (WebCore::SVGImageBufferTools::renderSubtreeToImageBuffer):

File:

• trunk/Source/WebCore/rendering/RenderFrameSet.cpp (modified) (4 diffs)

trunk/Source/WebCore/rendering/RenderFrameSet.cpp

@@ -119 +119 @@
 }
 
-void RenderFrameSet::paint(PaintInfo& paintInfo, int tx, int ty)
+void RenderFrameSet::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
 {
     if (paintInfo.phase != PaintPhaseForeground)
@@ -128 +128 @@
         return;
 
-    // Add in our offsets.
-    tx += x();
-    ty += y();
+    IntPoint adjustedPaintOffset = paintOffset + location();
 
     int rows = frameSet()->totalRows();
@@ -140 +138 @@
         int xPos = 0;
         for (int c = 0; c < cols; c++) {
-            child->paint(paintInfo, tx, ty);
+            child->paint(paintInfo, adjustedPaintOffset);
             xPos += m_cols.m_sizes[c];
             if (borderThickness && m_cols.m_allowBorder[c + 1]) {
-                paintColumnBorder(paintInfo, IntRect(tx + xPos, ty + yPos, borderThickness, height()));
+                paintColumnBorder(paintInfo, IntRect(adjustedPaintOffset.x() + xPos, adjustedPaintOffset.y() + yPos, borderThickness, height()));
                 xPos += borderThickness;
             }
@@ -152 +150 @@
         yPos += m_rows.m_sizes[r];
         if (borderThickness && m_rows.m_allowBorder[r + 1]) {
-            paintRowBorder(paintInfo, IntRect(tx, ty + yPos, width(), borderThickness));
+            paintRowBorder(paintInfo, IntRect(adjustedPaintOffset.x(), adjustedPaintOffset.y() + yPos, width(), borderThickness));
             yPos += borderThickness;
         }