Changeset 90048 in webkit


Ignore:
Timestamp:
Jun 29, 2011 2:33:11 PM (13 years ago)
Author:
leviw@chromium.org
Message:

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:
Location:
trunk/Source/WebCore
Files:
52 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r90046 r90048  
     12011-06-29  Levi Weintraub  <leviw@chromium.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Switch paint to new layout types
     6        https://bugs.webkit.org/show_bug.cgi?id=63645
     7
     8        Switch vanilla paint function over to the new layout unit abstraction.
     9
     10        No new tests, no functionality changes.
     11
     12        * rendering/RenderBlock.cpp:
     13        (WebCore::RenderBlock::paint):
     14        * rendering/RenderBlock.h:
     15        * rendering/RenderBox.cpp:
     16        (WebCore::RenderBox::paint):
     17        * rendering/RenderBox.h:
     18        * rendering/RenderDetailsMarker.cpp:
     19        (WebCore::RenderDetailsMarker::paint):
     20        * rendering/RenderDetailsMarker.h:
     21        * rendering/RenderEmbeddedObject.cpp:
     22        (WebCore::RenderEmbeddedObject::paint):
     23        * rendering/RenderEmbeddedObject.h:
     24        * rendering/RenderFrameSet.cpp:
     25        (WebCore::RenderFrameSet::paint):
     26        * rendering/RenderFrameSet.h:
     27        * rendering/RenderImage.cpp:
     28        (WebCore::RenderImage::paint):
     29        * rendering/RenderImage.h:
     30        * rendering/RenderInline.cpp:
     31        (WebCore::RenderInline::paint):
     32        * rendering/RenderInline.h:
     33        * rendering/RenderLineBoxList.h:
     34        * rendering/RenderListItem.cpp:
     35        (WebCore::RenderListItem::paint):
     36        * rendering/RenderListItem.h:
     37        * rendering/RenderListMarker.cpp:
     38        (WebCore::RenderListMarker::paint):
     39        * rendering/RenderListMarker.h:
     40        * rendering/RenderObject.h:
     41        * rendering/RenderReplaced.cpp:
     42        (WebCore::RenderReplaced::paint):
     43        * rendering/RenderReplaced.h:
     44        * rendering/RenderReplica.cpp:
     45        (WebCore::RenderReplica::paint):
     46        * rendering/RenderReplica.h:
     47        * rendering/RenderTable.cpp:
     48        (WebCore::RenderTable::paint):
     49        * rendering/RenderTable.h:
     50        * rendering/RenderTableCell.cpp:
     51        (WebCore::RenderTableCell::paint):
     52        * rendering/RenderTableCell.h:
     53        * rendering/RenderTableRow.cpp:
     54        (WebCore::RenderTableRow::paint):
     55        * rendering/RenderTableRow.h:
     56        * rendering/RenderTableSection.cpp:
     57        (WebCore::RenderTableSection::paint):
     58        * rendering/RenderTableSection.h:
     59        * rendering/RenderTextControlSingleLine.cpp:
     60        (WebCore::RenderTextControlSingleLine::paint):
     61        * rendering/RenderTextControlSingleLine.h:
     62        * rendering/RenderTheme.h:
     63        * rendering/RenderView.cpp:
     64        (WebCore::RenderView::paint):
     65        * rendering/RenderView.h:
     66        * rendering/RenderWidget.cpp:
     67        (WebCore::RenderWidget::paint):
     68        * rendering/RenderWidget.h:
     69        * rendering/mathml/RenderMathMLBlock.h:
     70        * rendering/mathml/RenderMathMLFraction.h:
     71        * rendering/mathml/RenderMathMLRoot.h:
     72        * rendering/mathml/RenderMathMLSquareRoot.h:
     73        * rendering/svg/RenderSVGContainer.h:
     74        * rendering/svg/RenderSVGForeignObject.h:
     75        * rendering/svg/RenderSVGHiddenContainer.h:
     76        * rendering/svg/RenderSVGImage.h:
     77        * rendering/svg/RenderSVGPath.h:
     78        * rendering/svg/RenderSVGRoot.cpp:
     79        (WebCore::RenderSVGRoot::paint):
     80        * rendering/svg/RenderSVGRoot.h:
     81        * rendering/svg/RenderSVGText.h:
     82
    1832011-06-29  Jian Li  <jianli@chromium.org>
    284

  • trunk/Source/WebCore/rendering/RenderBlock.cpp

    r90030 r90048  
    22632263}
    22642264 
    2265 void RenderBlock::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
    2266 {
    2267     IntPoint adjustedPaintOffset = paintOffset + location();
     2265void RenderBlock::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
     2266{
     2267    LayoutPoint adjustedPaintOffset = paintOffset + location();
    22682268   
    22692269    PaintPhase phase = paintInfo.phase;
    … …  
    22732273    // paints the root's background.
    22742274    if (!isRoot()) {
    2275         IntRect overflowBox = visualOverflowRect();
     2275        LayoutRect overflowBox = visualOverflowRect();
    22762276        flipForWritingMode(overflowBox);
    22772277        overflowBox.inflate(maximalOutlineSize(paintInfo.phase));

  • trunk/Source/WebCore/rendering/RenderBlock.h

    r90030 r90048  
    293293    void layoutPositionedObjects(bool relayoutChildren);
    294294
    295     virtual void paint(PaintInfo&, const IntPoint&);
     295    virtual void paint(PaintInfo&, const LayoutPoint&);
    296296    virtual void paintObject(PaintInfo&, const LayoutPoint&);
    297297

  • trunk/Source/WebCore/rendering/RenderBox.cpp

    r89979 r90048  
    772772// --------------------- painting stuff -------------------------------
    773773
    774 void RenderBox::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
    775 {
    776     IntPoint adjustedPaintOffset = paintOffset + location();
     774void RenderBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
     775{
     776    LayoutPoint adjustedPaintOffset = paintOffset + location();
    777777    // default implementation. Just pass paint through to the children
    778778    PaintInfo childInfo(paintInfo);

  • trunk/Source/WebCore/rendering/RenderBox.h

    r89983 r90048  
    240240
    241241    virtual void layout();
    242     virtual void paint(PaintInfo&, const IntPoint&);
     242    virtual void paint(PaintInfo&, const LayoutPoint&);
    243243    virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset, HitTestAction);
    244244

  • trunk/Source/WebCore/rendering/RenderDetailsMarker.cpp

    r88250 r90048  
    121121}
    122122
    123 void RenderDetailsMarker::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
     123void RenderDetailsMarker::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
    124124{
    125125    if (paintInfo.phase != PaintPhaseForeground || style()->visibility() != VISIBLE) {
    … …  
    128128    }
    129129
    130     IntPoint boxOrigin(paintOffset + location());
    131     IntRect overflowRect(visualOverflowRect());
     130    LayoutPoint boxOrigin(paintOffset + location());
     131    LayoutRect overflowRect(visualOverflowRect());
    132132    overflowRect.moveBy(boxOrigin);
    133133    overflowRect.inflate(maximalOutlineSize(paintInfo.phase));

  • trunk/Source/WebCore/rendering/RenderDetailsMarker.h

    r88250 r90048  
    4141    virtual const char* renderName() const { return "RenderDetailsMarker"; }
    4242    virtual bool isDetailsMarker() const { return true; }
    43     virtual void paint(PaintInfo&, const IntPoint&);
     43    virtual void paint(PaintInfo&, const LayoutPoint&);
    4444
    4545    bool isOpen() const;

  • trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp

    r89983 r90048  
    136136}
    137137
    138 void RenderEmbeddedObject::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
     138void RenderEmbeddedObject::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
    139139{
    140140    if (pluginCrashedOrWasMissing()) {

  • trunk/Source/WebCore/rendering/RenderEmbeddedObject.h

    r89983 r90048  
    5858
    5959    virtual void paintReplaced(PaintInfo&, const LayoutPoint&);
    60     virtual void paint(PaintInfo&, const IntPoint&);
     60    virtual void paint(PaintInfo&, const LayoutPoint&);
    6161
    6262#if USE(ACCELERATED_COMPOSITING)

  • trunk/Source/WebCore/rendering/RenderFrameSet.cpp

    r88319 r90048  
    119119}
    120120
    121 void RenderFrameSet::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
     121void RenderFrameSet::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
    122122{
    123123    if (paintInfo.phase != PaintPhaseForeground)
    … …  
    128128        return;
    129129
    130     IntPoint adjustedPaintOffset = paintOffset + location();
     130    LayoutPoint adjustedPaintOffset = paintOffset + location();
    131131
    132132    int rows = frameSet()->totalRows();
    133133    int cols = frameSet()->totalCols();
    134     int borderThickness = frameSet()->border();
    135    
    136     int yPos = 0;
     134    LayoutUnit borderThickness = frameSet()->border();
     135   
     136    LayoutUnit yPos = 0;
    137137    for (int r = 0; r < rows; r++) {
    138         int xPos = 0;
     138        LayoutUnit xPos = 0;
    139139        for (int c = 0; c < cols; c++) {
    140140            child->paint(paintInfo, adjustedPaintOffset);
    141141            xPos += m_cols.m_sizes[c];
    142142            if (borderThickness && m_cols.m_allowBorder[c + 1]) {
    143                 paintColumnBorder(paintInfo, IntRect(adjustedPaintOffset.x() + xPos, adjustedPaintOffset.y() + yPos, borderThickness, height()));
     143                paintColumnBorder(paintInfo, LayoutRect(adjustedPaintOffset.x() + xPos, adjustedPaintOffset.y() + yPos, borderThickness, height()));
    144144                xPos += borderThickness;
    145145            }
    … …  
    150150        yPos += m_rows.m_sizes[r];
    151151        if (borderThickness && m_rows.m_allowBorder[r + 1]) {
    152             paintRowBorder(paintInfo, IntRect(adjustedPaintOffset.x(), adjustedPaintOffset.y() + yPos, width(), borderThickness));
     152            paintRowBorder(paintInfo, LayoutRect(adjustedPaintOffset.x(), adjustedPaintOffset.y() + yPos, width(), borderThickness));
    153153            yPos += borderThickness;
    154154        }

  • trunk/Source/WebCore/rendering/RenderFrameSet.h

    r88319 r90048  
    9898    virtual void layout();
    9999    virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset, HitTestAction);
    100     virtual void paint(PaintInfo&, const IntPoint&);
     100    virtual void paint(PaintInfo&, const LayoutPoint&);
    101101    virtual bool isChildAllowed(RenderObject*, RenderStyle*) const;
    102102

  • trunk/Source/WebCore/rendering/RenderImage.cpp

    r89983 r90048  
    313313}
    314314
    315 void RenderImage::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
     315void RenderImage::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
    316316{
    317317    RenderReplaced::paint(paintInfo, paintOffset);

  • trunk/Source/WebCore/rendering/RenderImage.h

    r89983 r90048  
    6060
    6161    virtual void paintIntoRect(GraphicsContext*, const IntRect&);
    62     virtual void paint(PaintInfo&, const IntPoint&);
     62    virtual void paint(PaintInfo&, const LayoutPoint&);
    6363
    6464    bool isLogicalWidthSpecified() const;
    … …  
    7777    virtual bool isRenderImage() const { return true; }
    7878
    79     virtual void paintReplaced(PaintInfo&, const LayoutPoint&);
     79    virtual void paintReplaced(PaintInfo&, const IntPoint&);
    8080
    8181    virtual int minimumReplacedHeight() const;

  • trunk/Source/WebCore/rendering/RenderInline.cpp

    r89977 r90048  
    461461}
    462462
    463 void RenderInline::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
     463void RenderInline::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
    464464{
    465465    m_lineBoxes.paint(this, paintInfo, paintOffset);

  • trunk/Source/WebCore/rendering/RenderInline.h

    r89977 r90048  
    116116    virtual void layout() { ASSERT_NOT_REACHED(); } // Do nothing for layout()
    117117
    118     virtual void paint(PaintInfo&, const IntPoint&);
     118    virtual void paint(PaintInfo&, const LayoutPoint&);
    119119
    120120    virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset, HitTestAction);

  • trunk/Source/WebCore/rendering/RenderLineBoxList.h

    r88250 r90048  
    6464    void dirtyLinesFromChangedChild(RenderObject* parent, RenderObject* child);
    6565
    66     void paint(RenderBoxModelObject*, PaintInfo&, const IntPoint&) const;
     66    void paint(RenderBoxModelObject*, PaintInfo&, const LayoutPoint&) const;
    6767    bool hitTest(RenderBoxModelObject*, const HitTestRequest&, HitTestResult&, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset, HitTestAction) const;
    6868   

  • trunk/Source/WebCore/rendering/RenderListItem.cpp

    r88250 r90048  
    345345}
    346346
    347 void RenderListItem::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
     347void RenderListItem::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
    348348{
    349349    if (!logicalHeight())

  • trunk/Source/WebCore/rendering/RenderListItem.h

    r88250 r90048  
    5858
    5959    virtual bool isEmpty() const;
    60     virtual void paint(PaintInfo&, const IntPoint&);
     60    virtual void paint(PaintInfo&, const LayoutPoint&);
    6161
    6262    virtual void layout();

  • trunk/Source/WebCore/rendering/RenderListMarker.cpp

    r88250 r90048  
    11021102}
    11031103
    1104 void RenderListMarker::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
     1104void RenderListMarker::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
    11051105{
    11061106    if (paintInfo.phase != PaintPhaseForeground)
    … …  
    11101110        return;
    11111111
    1112     IntPoint boxOrigin(paintOffset + location());
    1113     IntRect overflowRect(visualOverflowRect());
     1112    LayoutPoint boxOrigin(paintOffset + location());
     1113    LayoutRect overflowRect(visualOverflowRect());
    11141114    overflowRect.moveBy(boxOrigin);
    11151115    overflowRect.inflate(maximalOutlineSize(paintInfo.phase));
    … …  
    11181118        return;
    11191119
    1120     IntRect box(boxOrigin, IntSize(width(), height()));
     1120    LayoutRect box(boxOrigin, LayoutSize(width(), height()));
    11211121   
    1122     IntRect marker = getRelativeMarkerRect();
     1122    LayoutRect marker = getRelativeMarkerRect();
    11231123    marker.moveBy(boxOrigin);
    11241124
    … …  
    11321132        context->drawImage(m_image->image(this, marker.size()).get(), style()->colorSpace(), marker);
    11331133        if (selectionState() != SelectionNone) {
    1134             IntRect selRect = localSelectionRect();
     1134            LayoutRect selRect = localSelectionRect();
    11351135            selRect.moveBy(boxOrigin);
    11361136            context->fillRect(selRect, selectionBackgroundColor(), style()->colorSpace());
    … …  
    11461146
    11471147    if (selectionState() != SelectionNone) {
    1148         IntRect selRect = localSelectionRect();
     1148        LayoutRect selRect = localSelectionRect();
    11491149        selRect.moveBy(boxOrigin);
    11501150        context->fillRect(selRect, selectionBackgroundColor(), style()->colorSpace());
    … …  
    12671267    }
    12681268
    1269     IntPoint textOrigin = IntPoint(marker.x(), marker.y() + style()->fontMetrics().ascent());
     1269    LayoutPoint textOrigin = LayoutPoint(marker.x(), marker.y() + style()->fontMetrics().ascent());
    12701270
    12711271    if (type == Asterisks || type == Footnotes)
    … …  
    12861286        const UChar suffix = listMarkerSuffix(type, m_listItem->value());
    12871287        if (style()->isLeftToRightDirection()) {
    1288             int width = font.width(textRun);
     1288            LayoutUnit width = font.width(textRun);
    12891289            context->drawText(font, textRun, textOrigin);
    12901290            UChar suffixSpace[2] = { suffix, ' ' };
    … …  
    12931293            UChar spaceSuffix[2] = { ' ', suffix };
    12941294            TextRun spaceSuffixRun = RenderBlock::constructTextRun(this, font, spaceSuffix, 2, style());
    1295             int width = font.width(spaceSuffixRun);
     1295            LayoutUnit width = font.width(spaceSuffixRun);
    12961296            context->drawText(font, spaceSuffixRun, textOrigin);
    12971297            context->drawText(font, textRun, textOrigin + IntSize(width, 0));

  • trunk/Source/WebCore/rendering/RenderListMarker.h

    r88250 r90048  
    5151    virtual bool isListMarker() const { return true; }
    5252
    53     virtual void paint(PaintInfo&, const IntPoint&);
     53    virtual void paint(PaintInfo&, const LayoutPoint&);
    5454
    5555    virtual void layout();

  • trunk/Source/WebCore/rendering/RenderObject.h

    r89970 r90048  
    532532    void updateImage(StyleImage*, StyleImage*);
    533533
    534     virtual void paint(PaintInfo&, const IntPoint&);
     534    virtual void paint(PaintInfo&, const LayoutPoint&);
    535535
    536536    // Recursive function that computes the size and position of this object and all its descendants.

  • trunk/Source/WebCore/rendering/RenderReplaced.cpp

    r88913 r90048  
    9595}
    9696
    97 void RenderReplaced::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
     97void RenderReplaced::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
    9898{
    9999    if (!shouldPaint(paintInfo, paintOffset))
    100100        return;
    101101   
    102     IntPoint adjustedPaintOffset = paintOffset + location();
     102    LayoutPoint adjustedPaintOffset = paintOffset + location();
    103103   
    104104    if (hasBoxDecorations() && (paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPhaseSelection))
    … …  
    110110    }
    111111
    112     IntRect paintRect = IntRect(adjustedPaintOffset, size());
     112    LayoutRect paintRect = LayoutRect(adjustedPaintOffset, size());
    113113    if ((paintInfo.phase == PaintPhaseOutline || paintInfo.phase == PaintPhaseSelfOutline) && style()->outlineWidth())
    114114        paintOutline(paintInfo.context, paintRect);
    … …  
    129129    bool completelyClippedOut = false;
    130130    if (style()->hasBorderRadius()) {
    131         IntRect borderRect = IntRect(adjustedPaintOffset, size());
     131        LayoutRect borderRect = LayoutRect(adjustedPaintOffset, size());
    132132
    133133        if (borderRect.isEmpty())
    … …  
    150150    // surrounding content.
    151151    if (drawSelectionTint) {
    152         IntRect selectionPaintingRect = localSelectionRect();
     152        LayoutRect selectionPaintingRect = localSelectionRect();
    153153        selectionPaintingRect.moveBy(adjustedPaintOffset);
    154154        paintInfo.context->fillRect(selectionPaintingRect, selectionBackgroundColor(), style()->colorSpace());

  • trunk/Source/WebCore/rendering/RenderReplaced.h

    r89983 r90048  
    5353    void setHasIntrinsicSize() { m_hasIntrinsicSize = true; }
    5454
    55     virtual void paint(PaintInfo&, const IntPoint&);
     55    virtual void paint(PaintInfo&, const LayoutPoint&);
    5656    bool shouldPaint(PaintInfo&, const IntPoint&);
    5757    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).

  • trunk/Source/WebCore/rendering/RenderReplica.cpp

    r88250 r90048  
    6161}
    6262
    63 void RenderReplica::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
     63void RenderReplica::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
    6464{
    6565    if (paintInfo.phase != PaintPhaseForeground && paintInfo.phase != PaintPhaseMask)
    6666        return;
    6767 
    68     IntPoint adjustedPaintOffset = paintOffset + location();
     68    LayoutPoint adjustedPaintOffset = paintOffset + location();
    6969
    7070    if (paintInfo.phase == PaintPhaseForeground)

  • trunk/Source/WebCore/rendering/RenderReplica.h

    r88250 r90048  
    4646    virtual void computePreferredLogicalWidths();
    4747   
    48     virtual void paint(PaintInfo&, const IntPoint&);
     48    virtual void paint(PaintInfo&, const LayoutPoint&);
    4949
    5050private:

  • trunk/Source/WebCore/rendering/RenderTable.cpp

    r89983 r90048  
    452452}
    453453
    454 void RenderTable::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
    455 {
    456     IntPoint adjustedPaintOffset = paintOffset + location();
     454void RenderTable::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
     455{
     456    LayoutPoint adjustedPaintOffset = paintOffset + location();
    457457
    458458    PaintPhase paintPhase = paintInfo.phase;
    459459
    460460    if (!isRoot()) {
    461         IntRect overflowBox = visualOverflowRect();
     461        LayoutRect overflowBox = visualOverflowRect();
    462462        flipForWritingMode(overflowBox);
    463463        overflowBox.inflate(maximalOutlineSize(paintInfo.phase));

  • trunk/Source/WebCore/rendering/RenderTable.h

    r89983 r90048  
    215215    virtual void removeChild(RenderObject* oldChild);
    216216
    217     virtual void paint(PaintInfo&, const IntPoint&);
     217    virtual void paint(PaintInfo&, const LayoutPoint&);
    218218    virtual void paintObject(PaintInfo&, const LayoutPoint&);
    219219    virtual void paintBoxDecorations(PaintInfo&, const IntPoint&);
    220     virtual void paintMask(PaintInfo&, const LayoutPoint&);
     220    virtual void paintMask(PaintInfo&, const IntPoint&);
    221221    virtual void layout();
    222222    virtual void computePreferredLogicalWidths();

  • trunk/Source/WebCore/rendering/RenderTableCell.cpp

    r89979 r90048  
    802802}
    803803
    804 void RenderTableCell::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
     804void RenderTableCell::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
    805805{
    806806    if (paintInfo.phase == PaintPhaseCollapsedTableBorders && style()->visibility() == VISIBLE) {
    … …  
    808808            return;
    809809
    810         IntPoint adjustedPaintOffset = paintOffset + location();
    811         int os = 2 * maximalOutlineSize(paintInfo.phase);
     810        LayoutPoint adjustedPaintOffset = paintOffset + location();
     811        LayoutUnit os = 2 * maximalOutlineSize(paintInfo.phase);
    812812        if (adjustedPaintOffset.y() - table()->outerBorderTop() < paintInfo.rect.maxY() + os
    813813            && adjustedPaintOffset.y() + height() + table()->outerBorderBottom() > paintInfo.rect.y() - os)
    814             paintCollapsedBorder(paintInfo.context, IntRect(adjustedPaintOffset, size()));
     814            paintCollapsedBorder(paintInfo.context, LayoutRect(adjustedPaintOffset, size()));
    815815        return;
    816816    }

  • trunk/Source/WebCore/rendering/RenderTableCell.h

    r89979 r90048  
    9595    virtual void layout();
    9696
    97     virtual void paint(PaintInfo&, const IntPoint&);
     97    virtual void paint(PaintInfo&, const LayoutPoint&);
    9898
    9999    void paintBackgroundsBehindCell(PaintInfo&, const IntPoint&, RenderObject* backgroundObject);

  • trunk/Source/WebCore/rendering/RenderTableRow.cpp

    r88319 r90048  
    209209}
    210210
    211 void RenderTableRow::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
     211void RenderTableRow::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
    212212{
    213213    ASSERT(hasSelfPaintingLayer());

  • trunk/Source/WebCore/rendering/RenderTableRow.h

    r88319 r90048  
    6060    virtual bool requiresLayer() const { return isTransparent() || hasOverflowClip() || hasTransform() || hasMask(); }
    6161
    62     virtual void paint(PaintInfo&, const IntPoint&);
     62    virtual void paint(PaintInfo&, const LayoutPoint&);
    6363
    6464    virtual void imageChanged(WrappedImagePtr, const IntRect* = 0);

  • trunk/Source/WebCore/rendering/RenderTableSection.cpp

    r89983 r90048  
    886886}
    887887
    888 void RenderTableSection::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
     888void RenderTableSection::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
    889889{
    890890    // put this back in when all layout tests can handle it
    … …  
    900900        return;
    901901
    902     IntPoint adjustedPaintOffset = paintOffset + location();
     902    LayoutPoint adjustedPaintOffset = paintOffset + location();
    903903
    904904    PaintPhase phase = paintInfo.phase;

  • trunk/Source/WebCore/rendering/RenderTableSection.h

    r89983 r90048  
    133133    virtual void removeChild(RenderObject* oldChild);
    134134
    135     virtual void paint(PaintInfo&, const IntPoint&);
     135    virtual void paint(PaintInfo&, const LayoutPoint&);
    136136    virtual void paintCell(RenderTableCell*, PaintInfo&, const IntPoint&);
    137137    virtual void paintObject(PaintInfo&, const LayoutPoint&);

  • trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp

    r89460 r90048  
    236236}
    237237
    238 void RenderTextControlSingleLine::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
     238void RenderTextControlSingleLine::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
    239239{
    240240    RenderTextControl::paint(paintInfo, paintOffset);
    241241
    242242    if (paintInfo.phase == PaintPhaseBlockBackground && m_shouldDrawCapsLockIndicator) {
    243         IntRect contentsRect = contentBoxRect();
     243        LayoutRect contentsRect = contentBoxRect();
    244244
    245245        // Center vertically like the text.

  • trunk/Source/WebCore/rendering/RenderTextControlSingleLine.h

    r89460 r90048  
    6262
    6363    virtual void subtreeHasChanged();
    64     virtual void paint(PaintInfo&, const IntPoint&);
     64    virtual void paint(PaintInfo&, const LayoutPoint&);
    6565    virtual void layout();
    6666

  • trunk/Source/WebCore/rendering/RenderTheme.h

    r89039 r90048  
    7777    // text of a button, is always rendered by the engine itself.  The boolean return value indicates
    7878    // whether the CSS border/background should also be painted.
    79     bool paint(RenderObject*, const PaintInfo&, const IntRect&);
     79    bool paint(RenderObject*, const PaintInfo&, const LayoutRect&);
    8080    bool paintBorderOnly(RenderObject*, const PaintInfo&, const IntRect&);
    8181    bool paintDecorations(RenderObject*, const PaintInfo&, const IntRect&);

  • trunk/Source/WebCore/rendering/RenderView.cpp

    r89979 r90048  
    166166}
    167167
    168 void RenderView::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
     168void RenderView::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
    169169{
    170170    // If we ever require layout but receive a paint anyway, something has gone horribly wrong.

  • trunk/Source/WebCore/rendering/RenderView.h

    r89979 r90048  
    7070    virtual void repaintRectangleInViewAndCompositedLayers(const IntRect&, bool immediate = false);
    7171
    72     virtual void paint(PaintInfo&, const IntPoint&);
    73     virtual void paintBoxDecorations(PaintInfo&, const LayoutPoint&);
     72    virtual void paint(PaintInfo&, const LayoutPoint&);
     73    virtual void paintBoxDecorations(PaintInfo&, const IntPoint&);
    7474
    7575    enum SelectionRepaintMode { RepaintNewXOROld, RepaintNewMinusOld };

  • trunk/Source/WebCore/rendering/RenderWidget.cpp

    r88934 r90048  
    248248}
    249249
    250 void RenderWidget::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
     250void RenderWidget::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
    251251{
    252252    if (!shouldPaint(paintInfo, paintOffset))
    253253        return;
    254254
    255     IntPoint adjustedPaintOffset = paintOffset + location();
     255    LayoutPoint adjustedPaintOffset = paintOffset + location();
    256256
    257257    if (hasBoxDecorations() && (paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPhaseSelection))
    … …  
    264264
    265265    if ((paintInfo.phase == PaintPhaseOutline || paintInfo.phase == PaintPhaseSelfOutline) && hasOutline())
    266         paintOutline(paintInfo.context, IntRect(adjustedPaintOffset, size()));
     266        paintOutline(paintInfo.context, LayoutRect(adjustedPaintOffset, size()));
    267267
    268268    if (!m_frameView || paintInfo.phase != PaintPhaseForeground)
    … …  
    275275
    276276    if (style()->hasBorderRadius()) {
    277         IntRect borderRect = IntRect(adjustedPaintOffset, size());
     277        LayoutRect borderRect = LayoutRect(adjustedPaintOffset, size());
    278278
    279279        if (borderRect.isEmpty())
    … …  
    291291            paintInfo.context->drawImage(m_substituteImage.get(), style()->colorSpace(), m_widget->frameRect());
    292292        else {
    293             IntPoint widgetLocation = m_widget->frameRect().location();
    294             IntPoint paintLocation(adjustedPaintOffset.x() + borderLeft() + paddingLeft(), adjustedPaintOffset.y() + borderTop() + paddingTop());
    295             IntRect paintRect = paintInfo.rect;
    296 
    297             IntSize widgetPaintOffset = paintLocation - widgetLocation;
     293            LayoutPoint widgetLocation = m_widget->frameRect().location();
     294            LayoutPoint paintLocation(adjustedPaintOffset.x() + borderLeft() + paddingLeft(), adjustedPaintOffset.y() + borderTop() + paddingTop());
     295            LayoutRect paintRect = paintInfo.rect;
     296
     297            LayoutSize widgetPaintOffset = paintLocation - widgetLocation;
    298298            // When painting widgets into compositing layers, tx and ty are relative to the enclosing compositing layer,
    299299            // not the root. In this case, shift the CTM and adjust the paintRect to be root-relative to fix plug-in drawing.

  • trunk/Source/WebCore/rendering/RenderWidget.h

    r88319 r90048  
    6161    virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
    6262    virtual void layout();
    63     virtual void paint(PaintInfo&, const IntPoint&);
     63    virtual void paint(PaintInfo&, const LayoutPoint&);
    6464
    6565private:

  • trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.h

    r88250 r90048  
    4949
    5050#if ENABLE(DEBUG_MATH_LAYOUT)
    51     virtual void paint(PaintInfo&, const IntPoint&);
     51    virtual void paint(PaintInfo&, const LayoutPoint&);
    5252#endif
    5353   

  • trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.h

    r88250 r90048  
    4040    virtual void updateFromElement();
    4141    virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const;
    42     virtual void paint(PaintInfo&, const IntPoint&);
     42    virtual void paint(PaintInfo&, const LayoutPoint&);
    4343protected:
    4444    virtual void layout();

  • trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.h

    r88250 r90048  
    3737    RenderMathMLRoot(Node* fraction);
    3838    virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0);
    39     virtual void paint(PaintInfo&, const IntPoint&);
     39    virtual void paint(PaintInfo&, const LayoutPoint&);
    4040protected:
    4141    virtual void layout();

  • trunk/Source/WebCore/rendering/mathml/RenderMathMLSquareRoot.h

    r88250 r90048  
    3636public:
    3737    RenderMathMLSquareRoot(Node* fraction);
    38     virtual void paint(PaintInfo&, const IntPoint&);
     38    virtual void paint(PaintInfo&, const LayoutPoint&);
    3939protected:
    4040    virtual void layout();

  • trunk/Source/WebCore/rendering/svg/RenderSVGContainer.h

    r88250 r90048  
    4040    RenderObjectChildList* children() { return &m_children; }
    4141
    42     virtual void paint(PaintInfo&, const IntPoint&);
     42    virtual void paint(PaintInfo&, const LayoutPoint&);
    4343    virtual void setNeedsBoundariesUpdate() { m_needsBoundariesUpdate = true; }
    4444

  • trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h

    r89754 r90048  
    3838    virtual const char* renderName() const { return "RenderSVGForeignObject"; }
    3939
    40     virtual void paint(PaintInfo&, const IntPoint&);
     40    virtual void paint(PaintInfo&, const LayoutPoint&);
    4141
    4242    virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer);

  • trunk/Source/WebCore/rendering/svg/RenderSVGHiddenContainer.h

    r88250 r90048  
    4242    virtual bool isSVGHiddenContainer() const { return true; }
    4343
    44     virtual void paint(PaintInfo&, const IntPoint&);
     44    virtual void paint(PaintInfo&, const LayoutPoint&);
    4545   
    4646    virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject*) { return IntRect(); }

  • trunk/Source/WebCore/rendering/svg/RenderSVGImage.h

    r88250 r90048  
    6363
    6464    virtual void layout();
    65     virtual void paint(PaintInfo&, const IntPoint&);
     65    virtual void paint(PaintInfo&, const LayoutPoint&);
    6666
    6767    virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint& pointInParent, HitTestAction);

  • trunk/Source/WebCore/rendering/svg/RenderSVGPath.h

    r88250 r90048  
    6161
    6262    virtual void layout();
    63     virtual void paint(PaintInfo&, const IntPoint&);
     63    virtual void paint(PaintInfo&, const LayoutPoint&);
    6464    virtual void addFocusRingRects(Vector<IntRect>&, const IntPoint&);
    6565

  • trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp

    r89754 r90048  
    263263}
    264264
    265 void RenderSVGRoot::paint(PaintInfo& paintInfo, const IntPoint& paintOffset)
     265void RenderSVGRoot::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
    266266{
    267267    if (paintInfo.context->paintingDisabled())
    … …  
    269269
    270270    bool isVisible = style()->visibility() == VISIBLE;
    271     IntPoint borderBoxOriginInContainer = paintOffset + parentOriginToBorderBox();
     271    LayoutPoint borderBoxOriginInContainer = paintOffset + parentOriginToBorderBox();
    272272
    273273    if (hasBoxDecorations() && (paintInfo.phase == PaintPhaseBlockBackground || paintInfo.phase == PaintPhaseChildBlockBackground) && isVisible)
    … …  
    301301
    302302    if (continueRendering)
    303         RenderBox::paint(childPaintInfo, IntPoint());
     303        RenderBox::paint(childPaintInfo, LayoutPoint());
    304304
    305305    if (childPaintInfo.phase == PaintPhaseForeground)
    … …  
    309309
    310310    if ((paintInfo.phase == PaintPhaseOutline || paintInfo.phase == PaintPhaseSelfOutline) && style()->outlineWidth() && isVisible)
    311         paintOutline(paintInfo.context, IntRect(borderBoxOriginInContainer, size()));
     311        paintOutline(paintInfo.context, LayoutRect(borderBoxOriginInContainer, size()));
    312312}
    313313

  • trunk/Source/WebCore/rendering/svg/RenderSVGRoot.h

    r89754 r90048  
    6363    virtual int computeReplacedLogicalHeight() const;
    6464    virtual void layout();
    65     virtual void paint(PaintInfo&, const IntPoint&);
     65    virtual void paint(PaintInfo&, const LayoutPoint&);
    6666
    6767    virtual void destroy();

  • trunk/Source/WebCore/rendering/svg/RenderSVGText.h

    r89754 r90048  
    5353    virtual bool isSVGText() const { return true; }
    5454
    55     virtual void paint(PaintInfo&, const IntPoint&);
     55    virtual void paint(PaintInfo&, const LayoutPoint&);
    5656    virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset, HitTestAction);
    5757    virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint& pointInParent, HitTestAction);
Note: See TracChangeset for help on using the changeset viewer.