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

Timestamp:

Jun 29, 2011, 2:33:11 PM (14 years ago)

Author:

[email protected]

Message:

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

Reviewed by Eric Seidel.

Switch paint to new layout types
​https://bugs.webkit.org/show_bug.cgi?id=63645

Switch vanilla paint function over to the new layout unit abstraction.

No new tests, no functionality changes.

• rendering/RenderBlock.cpp: (WebCore::RenderBlock::paint):
• rendering/RenderBlock.h:
• rendering/RenderBox.cpp: (WebCore::RenderBox::paint):
• rendering/RenderBox.h:
• 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/RenderLineBoxList.h:
• rendering/RenderListItem.cpp: (WebCore::RenderListItem::paint):
• rendering/RenderListItem.h:
• rendering/RenderListMarker.cpp: (WebCore::RenderListMarker::paint):
• rendering/RenderListMarker.h:
• rendering/RenderObject.h:
• rendering/RenderReplaced.cpp: (WebCore::RenderReplaced::paint):
• rendering/RenderReplaced.h:
• rendering/RenderReplica.cpp: (WebCore::RenderReplica::paint):
• rendering/RenderReplica.h:
• rendering/RenderTable.cpp: (WebCore::RenderTable::paint):
• 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):
• rendering/RenderTableSection.h:
• rendering/RenderTextControlSingleLine.cpp: (WebCore::RenderTextControlSingleLine::paint):
• rendering/RenderTextControlSingleLine.h:
• rendering/RenderTheme.h:
• rendering/RenderView.cpp: (WebCore::RenderView::paint):
• rendering/RenderView.h:
• rendering/RenderWidget.cpp: (WebCore::RenderWidget::paint):
• rendering/RenderWidget.h:
• rendering/mathml/RenderMathMLBlock.h:
• rendering/mathml/RenderMathMLFraction.h:
• rendering/mathml/RenderMathMLRoot.h:
• rendering/mathml/RenderMathMLSquareRoot.h:
• rendering/svg/RenderSVGContainer.h:
• rendering/svg/RenderSVGForeignObject.h:
• rendering/svg/RenderSVGHiddenContainer.h:
• rendering/svg/RenderSVGImage.h:
• rendering/svg/RenderSVGPath.h:
• rendering/svg/RenderSVGRoot.cpp: (WebCore::RenderSVGRoot::paint):
• rendering/svg/RenderSVGRoot.h:
• rendering/svg/RenderSVGText.h:

File:

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

trunk/Source/WebCore/rendering/RenderFrameSet.cpp

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