2011-06-29 Levi Weintraub <leviw@chromium.org>
authorleviw@chromium.org <leviw@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 29 Jun 2011 21:33:11 +0000 (21:33 +0000)
committerleviw@chromium.org <leviw@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 29 Jun 2011 21:33:11 +0000 (21:33 +0000)
        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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@90048 268f45cc-cd09-0410-ab3c-d52691b4dbfc

52 files changed:
Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderBlock.cpp
Source/WebCore/rendering/RenderBlock.h
Source/WebCore/rendering/RenderBox.cpp
Source/WebCore/rendering/RenderBox.h
Source/WebCore/rendering/RenderDetailsMarker.cpp
Source/WebCore/rendering/RenderDetailsMarker.h
Source/WebCore/rendering/RenderEmbeddedObject.cpp
Source/WebCore/rendering/RenderEmbeddedObject.h
Source/WebCore/rendering/RenderFrameSet.cpp
Source/WebCore/rendering/RenderFrameSet.h
Source/WebCore/rendering/RenderImage.cpp
Source/WebCore/rendering/RenderImage.h
Source/WebCore/rendering/RenderInline.cpp
Source/WebCore/rendering/RenderInline.h
Source/WebCore/rendering/RenderLineBoxList.h
Source/WebCore/rendering/RenderListItem.cpp
Source/WebCore/rendering/RenderListItem.h
Source/WebCore/rendering/RenderListMarker.cpp
Source/WebCore/rendering/RenderListMarker.h
Source/WebCore/rendering/RenderObject.h
Source/WebCore/rendering/RenderReplaced.cpp
Source/WebCore/rendering/RenderReplaced.h
Source/WebCore/rendering/RenderReplica.cpp
Source/WebCore/rendering/RenderReplica.h
Source/WebCore/rendering/RenderTable.cpp
Source/WebCore/rendering/RenderTable.h
Source/WebCore/rendering/RenderTableCell.cpp
Source/WebCore/rendering/RenderTableCell.h
Source/WebCore/rendering/RenderTableRow.cpp
Source/WebCore/rendering/RenderTableRow.h
Source/WebCore/rendering/RenderTableSection.cpp
Source/WebCore/rendering/RenderTableSection.h
Source/WebCore/rendering/RenderTextControlSingleLine.cpp
Source/WebCore/rendering/RenderTextControlSingleLine.h
Source/WebCore/rendering/RenderTheme.h
Source/WebCore/rendering/RenderView.cpp
Source/WebCore/rendering/RenderView.h
Source/WebCore/rendering/RenderWidget.cpp
Source/WebCore/rendering/RenderWidget.h
Source/WebCore/rendering/mathml/RenderMathMLBlock.h
Source/WebCore/rendering/mathml/RenderMathMLFraction.h
Source/WebCore/rendering/mathml/RenderMathMLRoot.h
Source/WebCore/rendering/mathml/RenderMathMLSquareRoot.h
Source/WebCore/rendering/svg/RenderSVGContainer.h
Source/WebCore/rendering/svg/RenderSVGForeignObject.h
Source/WebCore/rendering/svg/RenderSVGHiddenContainer.h
Source/WebCore/rendering/svg/RenderSVGImage.h
Source/WebCore/rendering/svg/RenderSVGPath.h
Source/WebCore/rendering/svg/RenderSVGRoot.cpp
Source/WebCore/rendering/svg/RenderSVGRoot.h
Source/WebCore/rendering/svg/RenderSVGText.h

index b5413ccf1428a25d40a2e232c88d7f3883915a95..f2ed8be0802df3b93751ca4f6954ea8e93c45e52 100644 (file)
@@ -1,3 +1,85 @@
+2011-06-29  Levi Weintraub  <leviw@chromium.org>
+
+        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:
+
 2011-06-29  Jian Li  <jianli@chromium.org>
 
         Reviewed by Kenneth Russell.
index 15b4caf58cd0ce486caebe8f253ef8bb5a9e7bd3..c16b5d7eda6034f4779f859488dfde7a71429c48 100644 (file)
@@ -2262,9 +2262,9 @@ void RenderBlock::repaintOverhangingFloats(bool paintAllDescendants)
     }
 }
  
-void RenderBlock::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
+void RenderBlock::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
-    IntPoint adjustedPaintOffset = paintOffset + location();
+    LayoutPoint adjustedPaintOffset = paintOffset + location();
     
     PaintPhase phase = paintInfo.phase;
 
@@ -2272,7 +2272,7 @@ void RenderBlock::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
     // FIXME: Could eliminate the isRoot() check if we fix background painting so that the RenderView
     // paints the root's background.
     if (!isRoot()) {
-        IntRect overflowBox = visualOverflowRect();
+        LayoutRect overflowBox = visualOverflowRect();
         flipForWritingMode(overflowBox);
         overflowBox.inflate(maximalOutlineSize(paintInfo.phase));
         overflowBox.moveBy(adjustedPaintOffset);
index 9f30166c1c243ef95702d6b09e510d44a399ba6c..b385ecd7fc05c626bf7d386da657250f9192a49d 100644 (file)
@@ -292,7 +292,7 @@ protected:
 
     void layoutPositionedObjects(bool relayoutChildren);
 
-    virtual void paint(PaintInfo&, const IntPoint&);
+    virtual void paint(PaintInfo&, const LayoutPoint&);
     virtual void paintObject(PaintInfo&, const LayoutPoint&);
 
     int logicalRightOffsetForLine(int position, int fixedOffset, bool applyTextIndent = true, int* logicalHeightRemaining = 0) const;
index e2b4bee8d932a80353acfe959fee5707855000d0..8b4a33f03b2eb4f11b657cebf471e72c5c39483e 100644 (file)
@@ -771,9 +771,9 @@ bool RenderBox::nodeAtPoint(const HitTestRequest& request, HitTestResult& result
 
 // --------------------- painting stuff -------------------------------
 
-void RenderBox::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
+void RenderBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
-    IntPoint adjustedPaintOffset = paintOffset + location();
+    LayoutPoint adjustedPaintOffset = paintOffset + location();
     // default implementation. Just pass paint through to the children
     PaintInfo childInfo(paintInfo);
     childInfo.updatePaintingRootForChildren(this);
index eb2f90438f5820ba545a2715a70bd04d6481a9cc..c5cdf36790fe627dbca557396c23a237955206d4 100644 (file)
@@ -239,7 +239,7 @@ public:
     IntRect reflectedRect(const IntRect&) const;
 
     virtual void layout();
-    virtual void paint(PaintInfo&, const IntPoint&);
+    virtual void paint(PaintInfo&, const LayoutPoint&);
     virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset, HitTestAction);
 
     virtual void destroy();
index d6f045b1e68bd7b53303fac3c38b0b21b288d56b..0b1de697340b18468d3ffa88c6db616cd0773f03 100644 (file)
@@ -120,15 +120,15 @@ Path RenderDetailsMarker::getPath(const IntPoint& origin) const
     return result;
 }
 
-void RenderDetailsMarker::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
+void RenderDetailsMarker::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     if (paintInfo.phase != PaintPhaseForeground || style()->visibility() != VISIBLE) {
         RenderBlock::paint(paintInfo, paintOffset);
         return;
     }
 
-    IntPoint boxOrigin(paintOffset + location());
-    IntRect overflowRect(visualOverflowRect());
+    LayoutPoint boxOrigin(paintOffset + location());
+    LayoutRect overflowRect(visualOverflowRect());
     overflowRect.moveBy(boxOrigin);
     overflowRect.inflate(maximalOutlineSize(paintInfo.phase));
 
index 5689d24211b2730b828afe003413bef1e37ed4ce..2b41c39f09231f2699ad2017f3e63b35fcdf8725 100644 (file)
@@ -40,7 +40,7 @@ public:
 private:
     virtual const char* renderName() const { return "RenderDetailsMarker"; }
     virtual bool isDetailsMarker() const { return true; }
-    virtual void paint(PaintInfo&, const IntPoint&);
+    virtual void paint(PaintInfo&, const LayoutPoint&);
 
     bool isOpen() const;
     Path getCanonicalPath() const;
index befc4d142383226a1e2e7f8aac9c988655471624..3f79b6f58e73d8e834d66d84a218d625600f67cf 100644 (file)
@@ -135,7 +135,7 @@ void RenderEmbeddedObject::setMissingPluginIndicatorIsPressed(bool pressed)
     repaint();
 }
 
-void RenderEmbeddedObject::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
+void RenderEmbeddedObject::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     if (pluginCrashedOrWasMissing()) {
         RenderReplaced::paint(paintInfo, paintOffset);
index 2e592a5f6825f8f8a06d7e1fe513f50373d4b43a..c90295f5c1fc0e142a96f40306890c84588bd798 100644 (file)
@@ -57,7 +57,7 @@ private:
     virtual bool isEmbeddedObject() const { return true; }
 
     virtual void paintReplaced(PaintInfo&, const LayoutPoint&);
-    virtual void paint(PaintInfo&, const IntPoint&);
+    virtual void paint(PaintInfo&, const LayoutPoint&);
 
 #if USE(ACCELERATED_COMPOSITING)
     virtual bool requiresLayer() const;
index 1f96d0110313d371dc1d319927e85f1b4dc2d9e9..7076cccddf6a94cc456595c10e99ea86873e5ba0 100644 (file)
@@ -118,7 +118,7 @@ void RenderFrameSet::paintRowBorder(const PaintInfo& paintInfo, const IntRect& b
     }
 }
 
-void RenderFrameSet::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
+void RenderFrameSet::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     if (paintInfo.phase != PaintPhaseForeground)
         return;
@@ -127,20 +127,20 @@ void RenderFrameSet::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
     if (!child)
         return;
 
-    IntPoint adjustedPaintOffset = paintOffset + location();
+    LayoutPoint adjustedPaintOffset = paintOffset + location();
 
     int rows = frameSet()->totalRows();
     int cols = frameSet()->totalCols();
-    int borderThickness = frameSet()->border();
+    LayoutUnit borderThickness = frameSet()->border();
     
-    int yPos = 0;
+    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;
             }
             child = child->nextSibling();
@@ -149,7 +149,7 @@ void RenderFrameSet::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
         }
         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;
         }
     }
index 45267ca4441c0d59ea832ad3414a7b40a69a5df0..04428370cad530536ac4af3e4a64876eb3177094 100644 (file)
@@ -97,7 +97,7 @@ private:
 
     virtual void layout();
     virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset, HitTestAction);
-    virtual void paint(PaintInfo&, const IntPoint&);
+    virtual void paint(PaintInfo&, const LayoutPoint&);
     virtual bool isChildAllowed(RenderObject*, RenderStyle*) const;
 
     inline HTMLFrameSetElement* frameSet() const;
index 374b0ad2578448baacebd5b219116b457b5bfa33..9be72db77557b5c8b77c765cf61df74b7fa3c008 100644 (file)
@@ -312,7 +312,7 @@ void RenderImage::paintReplaced(PaintInfo& paintInfo, const LayoutPoint& paintOf
     }
 }
 
-void RenderImage::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
+void RenderImage::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     RenderReplaced::paint(paintInfo, paintOffset);
     
index 83cd5a10fc1ad7c3cf19339d4d96ce0ececd42fa..e16405f1f3e3ba83bca26f84e350fd02a6e6def5 100644 (file)
@@ -59,7 +59,7 @@ protected:
     virtual void imageChanged(WrappedImagePtr, const IntRect* = 0);
 
     virtual void paintIntoRect(GraphicsContext*, const IntRect&);
-    virtual void paint(PaintInfo&, const IntPoint&);
+    virtual void paint(PaintInfo&, const LayoutPoint&);
 
     bool isLogicalWidthSpecified() const;
     bool isLogicalHeightSpecified() const;
@@ -76,7 +76,7 @@ private:
     virtual bool isImage() const { return true; }
     virtual bool isRenderImage() const { return true; }
 
-    virtual void paintReplaced(PaintInfo&, const LayoutPoint&);
+    virtual void paintReplaced(PaintInfo&, const IntPoint&);
 
     virtual int minimumReplacedHeight() const;
 
index 8cec3083f79a56e7bbb4d3cb3d5ab53c0bdfbc9d..6f4ae5801cef091888e66dd3add2063fb91168ba 100644 (file)
@@ -460,7 +460,7 @@ void RenderInline::addChildToContinuation(RenderObject* newChild, RenderObject*
     }
 }
 
-void RenderInline::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
+void RenderInline::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     m_lineBoxes.paint(this, paintInfo, paintOffset);
 }
index c8e07f4655f0ad4dfa193768c21501410f9b155b..6adfdb77860e4d158d35d17f8d91f478004ab8d7 100644 (file)
@@ -115,7 +115,7 @@ private:
 
     virtual void layout() { ASSERT_NOT_REACHED(); } // Do nothing for layout()
 
-    virtual void paint(PaintInfo&, const IntPoint&);
+    virtual void paint(PaintInfo&, const LayoutPoint&);
 
     virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset, HitTestAction);
 
index e67ef34f6cf22d28a0637a6604ea0febc70b7ea1..d06d2fab07a3f5b88b87e11dbeba4e48fb307c76 100644 (file)
@@ -63,7 +63,7 @@ public:
     void dirtyLineBoxes();
     void dirtyLinesFromChangedChild(RenderObject* parent, RenderObject* child);
 
-    void paint(RenderBoxModelObject*, PaintInfo&, const IntPoint&) const;
+    void paint(RenderBoxModelObject*, PaintInfo&, const LayoutPoint&) const;
     bool hitTest(RenderBoxModelObject*, const HitTestRequest&, HitTestResult&, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset, HitTestAction) const;
     
 private:
index 584b5cbaebd770f947fae3cac4631cccf09a550b..2e3494535fe1b34a5422722da31fd961e9b5a1d1 100644 (file)
@@ -344,7 +344,7 @@ void RenderListItem::positionListMarker()
     }
 }
 
-void RenderListItem::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
+void RenderListItem::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     if (!logicalHeight())
         return;
index c905e4aa10f4d45e0233e804c7b96b0bd83fd6a2..a05ba7dc2e9328ec4d1fa7079cedadf74dfdaa5b 100644 (file)
@@ -57,7 +57,7 @@ private:
     virtual void destroy();
 
     virtual bool isEmpty() const;
-    virtual void paint(PaintInfo&, const IntPoint&);
+    virtual void paint(PaintInfo&, const LayoutPoint&);
 
     virtual void layout();
     virtual void computePreferredLogicalWidths();
index 922322b5bfa5f263f5406259d6092f38f1cfc655..db9f5b4511a1a91c75e047941038824c7f3eab31 100644 (file)
@@ -1101,7 +1101,7 @@ IntRect RenderListMarker::localSelectionRect()
     return IntRect(newLogicalTop, 0, root->selectionHeight(), height());
 }
 
-void RenderListMarker::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
+void RenderListMarker::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     if (paintInfo.phase != PaintPhaseForeground)
         return;
@@ -1109,17 +1109,17 @@ void RenderListMarker::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
     if (style()->visibility() != VISIBLE)
         return;
 
-    IntPoint boxOrigin(paintOffset + location());
-    IntRect overflowRect(visualOverflowRect());
+    LayoutPoint boxOrigin(paintOffset + location());
+    LayoutRect overflowRect(visualOverflowRect());
     overflowRect.moveBy(boxOrigin);
     overflowRect.inflate(maximalOutlineSize(paintInfo.phase));
 
     if (!paintInfo.rect.intersects(overflowRect))
         return;
 
-    IntRect box(boxOrigin, IntSize(width(), height()));
+    LayoutRect box(boxOrigin, LayoutSize(width(), height()));
     
-    IntRect marker = getRelativeMarkerRect();
+    LayoutRect marker = getRelativeMarkerRect();
     marker.moveBy(boxOrigin);
 
     GraphicsContext* context = paintInfo.context;
@@ -1131,7 +1131,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
 #endif
         context->drawImage(m_image->image(this, marker.size()).get(), style()->colorSpace(), marker);
         if (selectionState() != SelectionNone) {
-            IntRect selRect = localSelectionRect();
+            LayoutRect selRect = localSelectionRect();
             selRect.moveBy(boxOrigin);
             context->fillRect(selRect, selectionBackgroundColor(), style()->colorSpace());
         }
@@ -1145,7 +1145,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
 #endif
 
     if (selectionState() != SelectionNone) {
-        IntRect selRect = localSelectionRect();
+        LayoutRect selRect = localSelectionRect();
         selRect.moveBy(boxOrigin);
         context->fillRect(selRect, selectionBackgroundColor(), style()->colorSpace());
     }
@@ -1266,7 +1266,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
         context->translate(-marker.x(), -marker.maxY());
     }
 
-    IntPoint textOrigin = IntPoint(marker.x(), marker.y() + style()->fontMetrics().ascent());
+    LayoutPoint textOrigin = LayoutPoint(marker.x(), marker.y() + style()->fontMetrics().ascent());
 
     if (type == Asterisks || type == Footnotes)
         context->drawText(font, textRun, textOrigin);
@@ -1285,14 +1285,14 @@ void RenderListMarker::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
 
         const UChar suffix = listMarkerSuffix(type, m_listItem->value());
         if (style()->isLeftToRightDirection()) {
-            int width = font.width(textRun);
+            LayoutUnit width = font.width(textRun);
             context->drawText(font, textRun, textOrigin);
             UChar suffixSpace[2] = { suffix, ' ' };
             context->drawText(font, RenderBlock::constructTextRun(this, font, suffixSpace, 2, style()), textOrigin + IntSize(width, 0));
         } else {
             UChar spaceSuffix[2] = { ' ', suffix };
             TextRun spaceSuffixRun = RenderBlock::constructTextRun(this, font, spaceSuffix, 2, style());
-            int width = font.width(spaceSuffixRun);
+            LayoutUnit width = font.width(spaceSuffixRun);
             context->drawText(font, spaceSuffixRun, textOrigin);
             context->drawText(font, textRun, textOrigin + IntSize(width, 0));
         }
index eeee08aa5ed70b7cc62e9029555484a914ea4420..49ef9b0ca1e7cf592b0824f91e28dec804e78ab9 100644 (file)
@@ -50,7 +50,7 @@ private:
 
     virtual bool isListMarker() const { return true; }
 
-    virtual void paint(PaintInfo&, const IntPoint&);
+    virtual void paint(PaintInfo&, const LayoutPoint&);
 
     virtual void layout();
 
index d293e8c8071f895c2662d98003620e79452337d7..822606e2a0a5401f0c23c14667d9884e2b976dc8 100644 (file)
@@ -531,7 +531,7 @@ public:
     void updateFillImages(const FillLayer*, const FillLayer*);
     void updateImage(StyleImage*, StyleImage*);
 
-    virtual void paint(PaintInfo&, const IntPoint&);
+    virtual void paint(PaintInfo&, const LayoutPoint&);
 
     // Recursive function that computes the size and position of this object and all its descendants.
     virtual void layout();
index 45cf220333021ca0288ce2bd237b695c9ad4922c..69da5f09beb4ed9d30516ef3e5b277a0a29e4e82 100644 (file)
@@ -94,12 +94,12 @@ void RenderReplaced::intrinsicSizeChanged()
     setNeedsLayoutAndPrefWidthsRecalc();
 }
 
-void RenderReplaced::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
+void RenderReplaced::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     if (!shouldPaint(paintInfo, paintOffset))
         return;
     
-    IntPoint adjustedPaintOffset = paintOffset + location();
+    LayoutPoint adjustedPaintOffset = paintOffset + location();
     
     if (hasBoxDecorations() && (paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPhaseSelection)) 
         paintBoxDecorations(paintInfo, adjustedPaintOffset);
@@ -109,7 +109,7 @@ void RenderReplaced::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
         return;
     }
 
-    IntRect paintRect = IntRect(adjustedPaintOffset, size());
+    LayoutRect paintRect = LayoutRect(adjustedPaintOffset, size());
     if ((paintInfo.phase == PaintPhaseOutline || paintInfo.phase == PaintPhaseSelfOutline) && style()->outlineWidth())
         paintOutline(paintInfo.context, paintRect);
     
@@ -128,7 +128,7 @@ void RenderReplaced::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
 
     bool completelyClippedOut = false;
     if (style()->hasBorderRadius()) {
-        IntRect borderRect = IntRect(adjustedPaintOffset, size());
+        LayoutRect borderRect = LayoutRect(adjustedPaintOffset, size());
 
         if (borderRect.isEmpty())
             completelyClippedOut = true;
@@ -149,7 +149,7 @@ void RenderReplaced::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
     // The selection tint never gets clipped by border-radius rounding, since we want it to run right up to the edges of
     // surrounding content.
     if (drawSelectionTint) {
-        IntRect selectionPaintingRect = localSelectionRect();
+        LayoutRect selectionPaintingRect = localSelectionRect();
         selectionPaintingRect.moveBy(adjustedPaintOffset);
         paintInfo.context->fillRect(selectionPaintingRect, selectionBackgroundColor(), style()->colorSpace());
     }
index 6db0658484a548adf36a6c16031ef1886f8b158f..b2428eb05c0973f4782ffc4edda99b23d439a3b7 100644 (file)
@@ -52,7 +52,7 @@ protected:
     virtual void intrinsicSizeChanged();
     void setHasIntrinsicSize() { m_hasIntrinsicSize = true; }
 
-    virtual void paint(PaintInfo&, const IntPoint&);
+    virtual void paint(PaintInfo&, const LayoutPoint&);
     bool shouldPaint(PaintInfo&, const IntPoint&);
     IntRect localSelectionRect(bool checkWhetherSelected = true) const; // This is in local coordinates, but it's a physical rect (so the top left corner is physical top left).
 
index aa92c3f0909142facb09e6b85a1d6e66e6b019f2..13a720372be9019d2f46074e17044cbebcefabdd 100644 (file)
@@ -60,12 +60,12 @@ void RenderReplica::computePreferredLogicalWidths()
     setPreferredLogicalWidthsDirty(false);
 }
 
-void RenderReplica::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
+void RenderReplica::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     if (paintInfo.phase != PaintPhaseForeground && paintInfo.phase != PaintPhaseMask)
         return;
  
-    IntPoint adjustedPaintOffset = paintOffset + location();
+    LayoutPoint adjustedPaintOffset = paintOffset + location();
 
     if (paintInfo.phase == PaintPhaseForeground)
         // Turn around and paint the parent layer. Use temporary clipRects, so that the layer doesn't end up caching clip rects
index 3e42f9de66aa05f920e0120093081de419bbd067..de694439e1292c4866045e193d438efcd7c2e00a 100644 (file)
@@ -45,7 +45,7 @@ public:
     virtual void layout();
     virtual void computePreferredLogicalWidths();
     
-    virtual void paint(PaintInfo&, const IntPoint&);
+    virtual void paint(PaintInfo&, const LayoutPoint&);
 
 private:
     virtual bool isReplica() const { return true; }
index bec9568aa41b032112a49d04f21ffd2e2f617117..12d84ea55e1ba064cd712a7648af65aa7c5410af 100644 (file)
@@ -451,14 +451,14 @@ void RenderTable::setCellLogicalWidths()
     }
 }
 
-void RenderTable::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
+void RenderTable::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
-    IntPoint adjustedPaintOffset = paintOffset + location();
+    LayoutPoint adjustedPaintOffset = paintOffset + location();
 
     PaintPhase paintPhase = paintInfo.phase;
 
     if (!isRoot()) {
-        IntRect overflowBox = visualOverflowRect();
+        LayoutRect overflowBox = visualOverflowRect();
         flipForWritingMode(overflowBox);
         overflowBox.inflate(maximalOutlineSize(paintInfo.phase));
         overflowBox.moveBy(adjustedPaintOffset);
index e0d59a2c0df8fc8b0a8fd63fccfcd055c4c0d3c0..d3115da64dc03cd9dc5904defb7ee7f6c5cad2b7 100644 (file)
@@ -214,10 +214,10 @@ private:
 
     virtual void removeChild(RenderObject* oldChild);
 
-    virtual void paint(PaintInfo&, const IntPoint&);
+    virtual void paint(PaintInfo&, const LayoutPoint&);
     virtual void paintObject(PaintInfo&, const LayoutPoint&);
     virtual void paintBoxDecorations(PaintInfo&, const IntPoint&);
-    virtual void paintMask(PaintInfo&, const LayoutPoint&);
+    virtual void paintMask(PaintInfo&, const IntPoint&);
     virtual void layout();
     virtual void computePreferredLogicalWidths();
     virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset, HitTestAction);
index 870079ef9c2c5c2d63692d29a47c0536683e6235..40c7f4d1056db926f47d7c1ba525cc2a6ba354b1 100644 (file)
@@ -801,17 +801,17 @@ int RenderTableCell::borderHalfAfter(bool outer) const
     return 0;
 }
 
-void RenderTableCell::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
+void RenderTableCell::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     if (paintInfo.phase == PaintPhaseCollapsedTableBorders && style()->visibility() == VISIBLE) {
         if (!paintInfo.shouldPaintWithinRoot(this))
             return;
 
-        IntPoint adjustedPaintOffset = paintOffset + location();
-        int os = 2 * maximalOutlineSize(paintInfo.phase);
+        LayoutPoint adjustedPaintOffset = paintOffset + location();
+        LayoutUnit os = 2 * maximalOutlineSize(paintInfo.phase);
         if (adjustedPaintOffset.y() - table()->outerBorderTop() < paintInfo.rect.maxY() + os
             && adjustedPaintOffset.y() + height() + table()->outerBorderBottom() > paintInfo.rect.y() - os)
-            paintCollapsedBorder(paintInfo.context, IntRect(adjustedPaintOffset, size()));
+            paintCollapsedBorder(paintInfo.context, LayoutRect(adjustedPaintOffset, size()));
         return;
     } 
     
index f95698d5eca7e569c5b80993e86a2afee618a810..b93582f3cff7131a95e552e9736e2f0644592b08 100644 (file)
@@ -94,7 +94,7 @@ public:
 
     virtual void layout();
 
-    virtual void paint(PaintInfo&, const IntPoint&);
+    virtual void paint(PaintInfo&, const LayoutPoint&);
 
     void paintBackgroundsBehindCell(PaintInfo&, const IntPoint&, RenderObject* backgroundObject);
 
index ad8047d6f912634426cd372ad061832da8d668aa..9ec477b05551823bf9fe0b6e7708b3f78fc691dc 100644 (file)
@@ -208,7 +208,7 @@ bool RenderTableRow::nodeAtPoint(const HitTestRequest& request, HitTestResult& r
     return false;
 }
 
-void RenderTableRow::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
+void RenderTableRow::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     ASSERT(hasSelfPaintingLayer());
     if (!layer())
index c4caafb4ea7154636b4105072ab9d68fe7c058ac..6cd922bf4f1c651810a3c9932c232067de71ecf4 100644 (file)
@@ -59,7 +59,7 @@ private:
     // The only time rows get a layer is when they have transparency.
     virtual bool requiresLayer() const { return isTransparent() || hasOverflowClip() || hasTransform() || hasMask(); }
 
-    virtual void paint(PaintInfo&, const IntPoint&);
+    virtual void paint(PaintInfo&, const LayoutPoint&);
 
     virtual void imageChanged(WrappedImagePtr, const IntRect* = 0);
 
index 7c2edea5191ea494e6bdd70a4226d70268d818d2..aa9c125e26e14778fd4d1d69c0d11d9a7745ca67 100644 (file)
@@ -885,7 +885,7 @@ int RenderTableSection::firstLineBoxBaseline() const
     return firstLineBaseline;
 }
 
-void RenderTableSection::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
+void RenderTableSection::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     // put this back in when all layout tests can handle it
     // ASSERT(!needsLayout());
@@ -899,7 +899,7 @@ void RenderTableSection::paint(PaintInfo& paintInfo, const IntPoint& paintOffset
     if (!totalRows || !totalCols)
         return;
 
-    IntPoint adjustedPaintOffset = paintOffset + location();
+    LayoutPoint adjustedPaintOffset = paintOffset + location();
 
     PaintPhase phase = paintInfo.phase;
     bool pushedClip = pushContentsClip(paintInfo, adjustedPaintOffset);
index 874f0524f84d5aaed851b306a4567827932a9169..27a886cbd135402ecc1a91c5daff8c72d88f0351 100644 (file)
@@ -132,7 +132,7 @@ private:
 
     virtual void removeChild(RenderObject* oldChild);
 
-    virtual void paint(PaintInfo&, const IntPoint&);
+    virtual void paint(PaintInfo&, const LayoutPoint&);
     virtual void paintCell(RenderTableCell*, PaintInfo&, const IntPoint&);
     virtual void paintObject(PaintInfo&, const LayoutPoint&);
 
index a29e3a8f70a191fecae8319a2b70b1e5570214e7..b893c640ad12bf0f92def571f4e96658cb7861dc 100644 (file)
@@ -235,12 +235,12 @@ void RenderTextControlSingleLine::subtreeHasChanged()
     }
 }
 
-void RenderTextControlSingleLine::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
+void RenderTextControlSingleLine::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     RenderTextControl::paint(paintInfo, paintOffset);
 
     if (paintInfo.phase == PaintPhaseBlockBackground && m_shouldDrawCapsLockIndicator) {
-        IntRect contentsRect = contentBoxRect();
+        LayoutRect contentsRect = contentBoxRect();
 
         // Center vertically like the text.
         contentsRect.setY((height() - contentsRect.height()) / 2);
index 208dd65ab7bc844a34693cc2ce3e1654f16634fb..b585ac43b541e751caf35b634d28a99f9fa562ee 100644 (file)
@@ -61,7 +61,7 @@ private:
     virtual bool isTextField() const { return true; }
 
     virtual void subtreeHasChanged();
-    virtual void paint(PaintInfo&, const IntPoint&);
+    virtual void paint(PaintInfo&, const LayoutPoint&);
     virtual void layout();
 
     virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset, HitTestAction);
index d0f1946f1a37f2208ea4c02738fdf9f9402af37d..38e9b76a98c297cfe0cc5b795fc232614224dd79 100644 (file)
@@ -76,7 +76,7 @@ public:
     // This method is called to paint the widget as a background of the RenderObject.  A widget's foreground, e.g., the
     // text of a button, is always rendered by the engine itself.  The boolean return value indicates
     // whether the CSS border/background should also be painted.
-    bool paint(RenderObject*, const PaintInfo&, const IntRect&);
+    bool paint(RenderObject*, const PaintInfo&, const LayoutRect&);
     bool paintBorderOnly(RenderObject*, const PaintInfo&, const IntRect&);
     bool paintDecorations(RenderObject*, const PaintInfo&, const IntRect&);
 
index d9015ae935a4e6b011e4db402727312c240b7a72..ab6227c07148ac80830459a4eab8af52e31b8bbb 100644 (file)
@@ -165,7 +165,7 @@ void RenderView::mapAbsoluteToLocalPoint(bool fixed, bool useTransforms, Transfo
     }
 }
 
-void RenderView::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
+void RenderView::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     // If we ever require layout but receive a paint anyway, something has gone horribly wrong.
     ASSERT(!needsLayout());
index 8899800a20e7edf96629a969e1434ffb6d26b26e..15114d270d8f71ca5b127853a90ab8205732e124 100644 (file)
@@ -69,8 +69,8 @@ public:
     // FIXME: ideally we'd never have to do this, if all repaints are container-relative.
     virtual void repaintRectangleInViewAndCompositedLayers(const IntRect&, bool immediate = false);
 
-    virtual void paint(PaintInfo&, const IntPoint&);
-    virtual void paintBoxDecorations(PaintInfo&, const LayoutPoint&);
+    virtual void paint(PaintInfo&, const LayoutPoint&);
+    virtual void paintBoxDecorations(PaintInfo&, const IntPoint&);
 
     enum SelectionRepaintMode { RepaintNewXOROld, RepaintNewMinusOld };
     void setSelection(RenderObject* start, int startPos, RenderObject* end, int endPos, SelectionRepaintMode = RepaintNewXOROld);
index 2b5a6140fbffaf7f750e054482452a9d55c29bfd..be6c355e3df8edf4d15cc7450bc6720473853562 100644 (file)
@@ -247,12 +247,12 @@ void RenderWidget::notifyWidget(WidgetNotification notification)
         m_widget->notifyWidget(notification);
 }
 
-void RenderWidget::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
+void RenderWidget::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     if (!shouldPaint(paintInfo, paintOffset))
         return;
 
-    IntPoint adjustedPaintOffset = paintOffset + location();
+    LayoutPoint adjustedPaintOffset = paintOffset + location();
 
     if (hasBoxDecorations() && (paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPhaseSelection))
         paintBoxDecorations(paintInfo, adjustedPaintOffset);
@@ -263,7 +263,7 @@ void RenderWidget::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
     }
 
     if ((paintInfo.phase == PaintPhaseOutline || paintInfo.phase == PaintPhaseSelfOutline) && hasOutline())
-        paintOutline(paintInfo.context, IntRect(adjustedPaintOffset, size()));
+        paintOutline(paintInfo.context, LayoutRect(adjustedPaintOffset, size()));
 
     if (!m_frameView || paintInfo.phase != PaintPhaseForeground)
         return;
@@ -274,7 +274,7 @@ void RenderWidget::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
 #endif
 
     if (style()->hasBorderRadius()) {
-        IntRect borderRect = IntRect(adjustedPaintOffset, size());
+        LayoutRect borderRect = LayoutRect(adjustedPaintOffset, size());
 
         if (borderRect.isEmpty())
             return;
@@ -290,11 +290,11 @@ void RenderWidget::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
         if (m_substituteImage)
             paintInfo.context->drawImage(m_substituteImage.get(), style()->colorSpace(), m_widget->frameRect());
         else {
-            IntPoint widgetLocation = m_widget->frameRect().location();
-            IntPoint paintLocation(adjustedPaintOffset.x() + borderLeft() + paddingLeft(), adjustedPaintOffset.y() + borderTop() + paddingTop());
-            IntRect paintRect = paintInfo.rect;
+            LayoutPoint widgetLocation = m_widget->frameRect().location();
+            LayoutPoint paintLocation(adjustedPaintOffset.x() + borderLeft() + paddingLeft(), adjustedPaintOffset.y() + borderTop() + paddingTop());
+            LayoutRect paintRect = paintInfo.rect;
 
-            IntSize widgetPaintOffset = paintLocation - widgetLocation;
+            LayoutSize widgetPaintOffset = paintLocation - widgetLocation;
             // When painting widgets into compositing layers, tx and ty are relative to the enclosing compositing layer,
             // not the root. In this case, shift the CTM and adjust the paintRect to be root-relative to fix plug-in drawing.
             if (!widgetPaintOffset.isZero()) {
index 29c96c9783d7526658c165d9e7d4db23ce530b67..92020a67daabf15cac5e800f496cc968c9ce4700 100644 (file)
@@ -60,7 +60,7 @@ protected:
 
     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
     virtual void layout();
-    virtual void paint(PaintInfo&, const IntPoint&);
+    virtual void paint(PaintInfo&, const LayoutPoint&);
 
 private:
     virtual bool isWidget() const { return true; }
index c246a7787c27c39474663f9fdc48a8db39e4741f..33658c05920ffc604a18eac4bbf5ad055df21e40 100644 (file)
@@ -48,7 +48,7 @@ public:
     virtual void stretchToHeight(int height);
 
 #if ENABLE(DEBUG_MATH_LAYOUT)
-    virtual void paint(PaintInfo&, const IntPoint&);
+    virtual void paint(PaintInfo&, const LayoutPoint&);
 #endif
     
 protected:
index 79139cd2ac6bd9bd907d973d18703c6d7cca29f1..4fe3d63d23849bb776712112520df0249bcd1755 100644 (file)
@@ -39,7 +39,7 @@ public:
     virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0);
     virtual void updateFromElement();
     virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const; 
-    virtual void paint(PaintInfo&, const IntPoint&);
+    virtual void paint(PaintInfo&, const LayoutPoint&);
 protected:
     virtual void layout();
 private:
index 6981ce9717c11becf86c8ea4972ea9bfdd28debf..c233bdfab81f52f5a6eb5bc9968dde74f199251e 100644 (file)
@@ -36,7 +36,7 @@ class RenderMathMLRoot : public RenderMathMLBlock {
 public:
     RenderMathMLRoot(Node* fraction);
     virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0);
-    virtual void paint(PaintInfo&, const IntPoint&);
+    virtual void paint(PaintInfo&, const LayoutPoint&);
 protected:
     virtual void layout();
 };
index 24756ce25885777a62247a7f2e85e3fc78958e21..f41aa88cab003dbef29914c7aa12c63e177a8df0 100644 (file)
@@ -35,7 +35,7 @@ namespace WebCore {
 class RenderMathMLSquareRoot : public RenderMathMLBlock {
 public:
     RenderMathMLSquareRoot(Node* fraction);
-    virtual void paint(PaintInfo&, const IntPoint&);
+    virtual void paint(PaintInfo&, const LayoutPoint&);
 protected:
     virtual void layout();
 };
index d94ff8c3bba46ca79e34a7bc2ef52d6ef8ca3e15..a35dd94afec76ad2d41c263371d8dc9d33ae3fc8 100644 (file)
@@ -39,7 +39,7 @@ public:
     const RenderObjectChildList* children() const { return &m_children; }
     RenderObjectChildList* children() { return &m_children; }
 
-    virtual void paint(PaintInfo&, const IntPoint&);
+    virtual void paint(PaintInfo&, const LayoutPoint&);
     virtual void setNeedsBoundariesUpdate() { m_needsBoundariesUpdate = true; }
 
 protected:
index 50337c7fd6198e391e101a750d8d6cb9be56a807..0bb00c7feef6318e2620a065a9a46ca862344ad5 100644 (file)
@@ -37,7 +37,7 @@ public:
 
     virtual const char* renderName() const { return "RenderSVGForeignObject"; }
 
-    virtual void paint(PaintInfo&, const IntPoint&);
+    virtual void paint(PaintInfo&, const LayoutPoint&);
 
     virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer);
     virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false);
index 07c201209d68645b452b3926613c3c0afda9d85c..d1423eb88f14b45aeaf243dc6fcfa12645b72dfa 100644 (file)
@@ -41,7 +41,7 @@ protected:
 private:
     virtual bool isSVGHiddenContainer() const { return true; }
 
-    virtual void paint(PaintInfo&, const IntPoint&);
+    virtual void paint(PaintInfo&, const LayoutPoint&);
     
     virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject*) { return IntRect(); }
     virtual void absoluteQuads(Vector<FloatQuad>&);
index 4d7a36a96e028a15cafc806cafb38758d422e060..1276ff51666957e46539b12d070c713fefc8914d 100644 (file)
@@ -62,7 +62,7 @@ private:
     virtual void imageChanged(WrappedImagePtr, const IntRect* = 0);
 
     virtual void layout();
-    virtual void paint(PaintInfo&, const IntPoint&);
+    virtual void paint(PaintInfo&, const LayoutPoint&);
 
     virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint& pointInParent, HitTestAction);
 
index a3290710ce2e4b97573e82f165e55e2c7221b122..055bba368d4135bd9e231567b181cd6cce50f117 100644 (file)
@@ -60,7 +60,7 @@ private:
     virtual const char* renderName() const { return "RenderSVGPath"; }
 
     virtual void layout();
-    virtual void paint(PaintInfo&, const IntPoint&);
+    virtual void paint(PaintInfo&, const LayoutPoint&);
     virtual void addFocusRingRects(Vector<IntRect>&, const IntPoint&);
 
     virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint& pointInParent, HitTestAction);
index c1123128cde88d73deb73c516ac17db6e34b56de..5960b5d50bd5ff5368f09e672b6a3a8debf7e5bc 100644 (file)
@@ -262,13 +262,13 @@ bool RenderSVGRoot::selfWillPaint()
 #endif
 }
 
-void RenderSVGRoot::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
+void RenderSVGRoot::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     if (paintInfo.context->paintingDisabled())
         return;
 
     bool isVisible = style()->visibility() == VISIBLE;
-    IntPoint borderBoxOriginInContainer = paintOffset + parentOriginToBorderBox();
+    LayoutPoint borderBoxOriginInContainer = paintOffset + parentOriginToBorderBox();
 
     if (hasBoxDecorations() && (paintInfo.phase == PaintPhaseBlockBackground || paintInfo.phase == PaintPhaseChildBlockBackground) && isVisible)
         paintBoxDecorations(paintInfo, borderBoxOriginInContainer);
@@ -300,7 +300,7 @@ void RenderSVGRoot::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
         continueRendering = SVGRenderSupport::prepareToRenderSVGContent(this, childPaintInfo);
 
     if (continueRendering)
-        RenderBox::paint(childPaintInfo, IntPoint());
+        RenderBox::paint(childPaintInfo, LayoutPoint());
 
     if (childPaintInfo.phase == PaintPhaseForeground)
         SVGRenderSupport::finishRenderSVGContent(this, childPaintInfo, paintInfo.context);
@@ -308,7 +308,7 @@ void RenderSVGRoot::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
     childPaintInfo.context->restore();
 
     if ((paintInfo.phase == PaintPhaseOutline || paintInfo.phase == PaintPhaseSelfOutline) && style()->outlineWidth() && isVisible)
-        paintOutline(paintInfo.context, IntRect(borderBoxOriginInContainer, size()));
+        paintOutline(paintInfo.context, LayoutRect(borderBoxOriginInContainer, size()));
 }
 
 void RenderSVGRoot::destroy()
index 47c654653eda790c25e4b0c130e226217d181cf6..74d43d86314a18ea77ba1fca3ecf8a2ddf69c90f 100644 (file)
@@ -62,7 +62,7 @@ private:
     virtual int computeReplacedLogicalWidth(bool includeMaxWidth = true) const;
     virtual int computeReplacedLogicalHeight() const;
     virtual void layout();
-    virtual void paint(PaintInfo&, const IntPoint&);
+    virtual void paint(PaintInfo&, const LayoutPoint&);
 
     virtual void destroy();
     virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle);
index caed47f9b1321d066d6d8ff82da53b8df752473a..b1cd1ef562f07be5b314c7de5b0fe62fb5f11641 100644 (file)
@@ -52,7 +52,7 @@ private:
     virtual const char* renderName() const { return "RenderSVGText"; }
     virtual bool isSVGText() const { return true; }
 
-    virtual void paint(PaintInfo&, const IntPoint&);
+    virtual void paint(PaintInfo&, const LayoutPoint&);
     virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset, HitTestAction);
     virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint& pointInParent, HitTestAction);
     virtual VisiblePosition positionForPoint(const IntPoint&);