Changeset 89983 in webkit


Ignore:
Timestamp:
Jun 28, 2011 6:06:00 PM (13 years ago)
Author:
leviw@chromium.org
Message:

2011-06-28 Levi Weintraub <​leviw@chromium.org>

Reviewed by Eric Seidel.

Switch paintObject and paintReplaced to new layout types
​https://bugs.webkit.org/show_bug.cgi?id=63585

Switching paintObject and paintReplaced to layout type abstractions from more integral types.

No new tests as this is just moving to an abstraction.

  • rendering/RenderBlock.cpp: (WebCore::RenderBlock::paintObject):
  • rendering/RenderBlock.h:
  • rendering/RenderBox.h: (WebCore::RenderBox::paintObject):
  • rendering/RenderEmbeddedObject.cpp: (WebCore::RenderEmbeddedObject::paintReplaced):
  • rendering/RenderEmbeddedObject.h:
  • rendering/RenderFileUploadControl.cpp: (WebCore::RenderFileUploadControl::paintObject):
  • rendering/RenderFileUploadControl.h:
  • rendering/RenderHTMLCanvas.cpp: (WebCore::RenderHTMLCanvas::paintReplaced):
  • rendering/RenderHTMLCanvas.h:
  • rendering/RenderImage.cpp: (WebCore::RenderImage::paintReplaced):
  • rendering/RenderImage.h:
  • rendering/RenderListBox.cpp: (WebCore::RenderListBox::paintObject):
  • rendering/RenderListBox.h:
  • rendering/RenderReplaced.h: (WebCore::RenderReplaced::paintReplaced):
  • rendering/RenderTable.cpp: (WebCore::RenderTable::paintObject):
  • rendering/RenderTable.h:
  • rendering/RenderTableSection.cpp: (WebCore::RenderTableSection::paintObject):
  • rendering/RenderTableSection.h:
  • rendering/RenderTextControl.cpp: (WebCore::RenderTextControl::paintObject):
  • rendering/RenderTextControl.h:
  • rendering/RenderVideo.cpp: (WebCore::RenderVideo::paintReplaced):
  • rendering/RenderVideo.h:
Location:
trunk/Source/WebCore
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r89982 r89983  
     12011-06-28  Levi Weintraub  <leviw@chromium.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Switch paintObject and paintReplaced to new layout types
     6        https://bugs.webkit.org/show_bug.cgi?id=63585
     7
     8        Switching paintObject and paintReplaced to layout type abstractions from more integral types.
     9
     10        No new tests as this is just moving to an abstraction.
     11
     12        * rendering/RenderBlock.cpp:
     13        (WebCore::RenderBlock::paintObject):
     14        * rendering/RenderBlock.h:
     15        * rendering/RenderBox.h:
     16        (WebCore::RenderBox::paintObject):
     17        * rendering/RenderEmbeddedObject.cpp:
     18        (WebCore::RenderEmbeddedObject::paintReplaced):
     19        * rendering/RenderEmbeddedObject.h:
     20        * rendering/RenderFileUploadControl.cpp:
     21        (WebCore::RenderFileUploadControl::paintObject):
     22        * rendering/RenderFileUploadControl.h:
     23        * rendering/RenderHTMLCanvas.cpp:
     24        (WebCore::RenderHTMLCanvas::paintReplaced):
     25        * rendering/RenderHTMLCanvas.h:
     26        * rendering/RenderImage.cpp:
     27        (WebCore::RenderImage::paintReplaced):
     28        * rendering/RenderImage.h:
     29        * rendering/RenderListBox.cpp:
     30        (WebCore::RenderListBox::paintObject):
     31        * rendering/RenderListBox.h:
     32        * rendering/RenderReplaced.h:
     33        (WebCore::RenderReplaced::paintReplaced):
     34        * rendering/RenderTable.cpp:
     35        (WebCore::RenderTable::paintObject):
     36        * rendering/RenderTable.h:
     37        * rendering/RenderTableSection.cpp:
     38        (WebCore::RenderTableSection::paintObject):
     39        * rendering/RenderTableSection.h:
     40        * rendering/RenderTextControl.cpp:
     41        (WebCore::RenderTextControl::paintObject):
     42        * rendering/RenderTextControl.h:
     43        * rendering/RenderVideo.cpp:
     44        (WebCore::RenderVideo::paintReplaced):
     45        * rendering/RenderVideo.h:
     46
    1472011-06-28  Adam Langley  <agl@chromium.org>
    248

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

    r89836 r89983  
    24802480}
    24812481
    2482 void RenderBlock::paintObject(PaintInfo& paintInfo, const IntPoint& paintOffset)
     2482void RenderBlock::paintObject(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
    24832483{
    24842484    PaintPhase paintPhase = paintInfo.phase;
    … …  
    25022502
    25032503    // Adjust our painting position if we're inside a scrolled layer (e.g., an overflow:auto div).
    2504     IntPoint scrolledOffset = paintOffset;
     2504    LayoutPoint scrolledOffset = paintOffset;
    25052505    if (hasOverflowClip())
    25062506        scrolledOffset.move(-layer()->scrolledContentOffset());

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

    r89165 r89983  
    294294
    295295    virtual void paint(PaintInfo&, const IntPoint&);
    296     virtual void paintObject(PaintInfo&, const IntPoint&);
     296    virtual void paintObject(PaintInfo&, const LayoutPoint&);
    297297
    298298    int logicalRightOffsetForLine(int position, int fixedOffset, bool applyTextIndent = true, int* logicalHeightRemaining = 0) const;

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

    r89979 r89983  
    353353    void popContentsClip(PaintInfo&, PaintPhase originalPhase, const IntPoint& accumulatedOffset);
    354354
    355     virtual void paintObject(PaintInfo&, const IntPoint&) { ASSERT_NOT_REACHED(); }
     355    virtual void paintObject(PaintInfo&, const LayoutPoint&) { ASSERT_NOT_REACHED(); }
    356356    virtual void paintBoxDecorations(PaintInfo&, const LayoutPoint&);
    357357    virtual void paintMask(PaintInfo&, const LayoutPoint&);

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

    r88400 r89983  
    146146}
    147147
    148 void RenderEmbeddedObject::paintReplaced(PaintInfo& paintInfo, const IntPoint& paintOffset)
     148void RenderEmbeddedObject::paintReplaced(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
    149149{
    150150    if (!pluginCrashedOrWasMissing())

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

    r88400 r89983  
    5757    virtual bool isEmbeddedObject() const { return true; }
    5858
    59     virtual void paintReplaced(PaintInfo&, const IntPoint&);
     59    virtual void paintReplaced(PaintInfo&, const LayoutPoint&);
    6060    virtual void paint(PaintInfo&, const IntPoint&);
    6161

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

    r89950 r89983  
    7777}
    7878
    79 void RenderFileUploadControl::paintObject(PaintInfo& paintInfo, const IntPoint& paintOffset)
     79void RenderFileUploadControl::paintObject(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
    8080{
    8181    if (style()->visibility() != VISIBLE)
    … …  
    8585    GraphicsContextStateSaver stateSaver(*paintInfo.context, false);
    8686    if (paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPhaseChildBlockBackgrounds) {
    87         IntRect clipRect(paintOffset.x() + borderLeft(), paintOffset.y() + borderTop(),
     87        LayoutRect clipRect(paintOffset.x() + borderLeft(), paintOffset.y() + borderTop(),
    8888                         width() - borderLeft() - borderRight(), height() - borderBottom() - borderTop() + buttonShadowHeight);
    8989        if (clipRect.isEmpty())
    … …  
    100100
    101101        // Determine where the filename should be placed
    102         int contentLeft = paintOffset.x() + borderLeft() + paddingLeft();
     102        LayoutUnit contentLeft = paintOffset.x() + borderLeft() + paddingLeft();
    103103        HTMLInputElement* button = uploadButton();
    104104        if (!button)
    … …  
    106106
    107107        HTMLInputElement* input = static_cast<HTMLInputElement*>(node());
    108         int buttonWidth = nodeWidth(button);
    109         int buttonAndIconWidth = buttonWidth + afterButtonSpacing
     108        LayoutUnit buttonWidth = nodeWidth(button);
     109        LayoutUnit buttonAndIconWidth = buttonWidth + afterButtonSpacing
    110110            + (input->icon() ? iconWidth + iconFilenameSpacing : 0);
    111         int textX;
     111        LayoutUnit textX;
    112112        if (style()->isLeftToRightDirection())
    113113            textX = contentLeft + buttonAndIconWidth;
    … …  
    116116        // We want to match the button's baseline
    117117        RenderButton* buttonRenderer = toRenderButton(button->renderer());
    118         int textY = buttonRenderer->absoluteBoundingBoxRect().y()
     118        LayoutUnit textY = buttonRenderer->absoluteBoundingBoxRect().y()
    119119            + buttonRenderer->marginTop() + buttonRenderer->borderTop() + buttonRenderer->paddingTop()
    120120            + buttonRenderer->baselinePosition(AlphabeticBaseline, true, HorizontalLine, PositionOnContainingLine);
    … …  
    123123       
    124124        // Draw the filename
    125         paintInfo.context->drawBidiText(font, textRun, IntPoint(textX, textY));
     125        paintInfo.context->drawBidiText(font, textRun, LayoutPoint(textX, textY));
    126126       
    127127        if (input->icon()) {
    128128            // Determine where the icon should be placed
    129             int iconY = paintOffset.y() + borderTop() + paddingTop() + (contentHeight() - iconHeight) / 2;
    130             int iconX;
     129            LayoutUnit iconY = paintOffset.y() + borderTop() + paddingTop() + (contentHeight() - iconHeight) / 2;
     130            LayoutUnit iconX;
    131131            if (style()->isLeftToRightDirection())
    132132                iconX = contentLeft + buttonWidth + afterButtonSpacing;
    … …  
    135135
    136136            // Draw the file icon
    137             input->icon()->paint(paintInfo.context, IntRect(iconX, iconY, iconWidth, iconHeight));
     137            input->icon()->paint(paintInfo.context, LayoutRect(iconX, iconY, iconWidth, iconHeight));
    138138        }
    139139    }

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

    r89535 r89983  
    4747    virtual void updateFromElement();
    4848    virtual void computePreferredLogicalWidths();
    49     virtual void paintObject(PaintInfo&, const IntPoint&);
     49    virtual void paintObject(PaintInfo&, const LayoutPoint&);
    5050
    5151    virtual bool requiresForcedStyleRecalcPropagation() const { return true; }

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

    r87989 r89983  
    5555}
    5656
    57 void RenderHTMLCanvas::paintReplaced(PaintInfo& paintInfo, const IntPoint& paintOffset)
     57void RenderHTMLCanvas::paintReplaced(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
    5858{
    59     IntRect rect = contentBoxRect();
     59    LayoutRect rect = contentBoxRect();
    6060    rect.moveBy(paintOffset);
    6161    bool useLowQualityScale = style()->imageRendering() == ImageRenderingOptimizeContrast;

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

    r87989 r89983  
    4444private:
    4545    virtual const char* renderName() const { return "RenderHTMLCanvas"; }
    46     virtual void paintReplaced(PaintInfo&, const IntPoint&);
     46    virtual void paintReplaced(PaintInfo&, const LayoutPoint&);
    4747    virtual void intrinsicSizeChanged() { canvasSizeChanged(); }
    4848};

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

    r88319 r89983  
    232232}
    233233
    234 void RenderImage::paintReplaced(PaintInfo& paintInfo, const IntPoint& paintOffset)
    235 {
    236     int cWidth = contentWidth();
    237     int cHeight = contentHeight();
    238     int leftBorder = borderLeft();
    239     int topBorder = borderTop();
    240     int leftPad = paddingLeft();
    241     int topPad = paddingTop();
     234void RenderImage::paintReplaced(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
     235{
     236    LayoutUnit cWidth = contentWidth();
     237    LayoutUnit cHeight = contentHeight();
     238    LayoutUnit leftBorder = borderLeft();
     239    LayoutUnit topBorder = borderTop();
     240    LayoutUnit leftPad = paddingLeft();
     241    LayoutUnit topPad = paddingTop();
    242242
    243243    GraphicsContext* context = paintInfo.context;
    … …  
    252252            context->setStrokeColor(Color::lightGray, style()->colorSpace());
    253253            context->setFillColor(Color::transparent, style()->colorSpace());
    254             context->drawRect(IntRect(paintOffset.x() + leftBorder + leftPad, paintOffset.y() + topBorder + topPad, cWidth, cHeight));
     254            context->drawRect(LayoutRect(paintOffset.x() + leftBorder + leftPad, paintOffset.y() + topBorder + topPad, cWidth, cHeight));
    255255
    256256            bool errorPictureDrawn = false;
    257             IntSize imageOffset;
     257            LayoutSize imageOffset;
    258258            // When calculating the usable dimensions, exclude the pixels of
    259259            // the ouline rect so the error image/alt text doesn't draw on it.
    260             int usableWidth = cWidth - 2;
    261             int usableHeight = cHeight - 2;
     260            LayoutUnit usableWidth = cWidth - 2;
     261            LayoutUnit usableHeight = cHeight - 2;
    262262
    263263            RefPtr<Image> image = m_imageResource->image();
    … …  
    265265            if (m_imageResource->errorOccurred() && !image->isNull() && usableWidth >= image->width() && usableHeight >= image->height()) {
    266266                // Center the error image, accounting for border and padding.
    267                 int centerX = (usableWidth - image->width()) / 2;
     267                LayoutUnit centerX = (usableWidth - image->width()) / 2;
    268268                if (centerX < 0)
    269269                    centerX = 0;
    270                 int centerY = (usableHeight - image->height()) / 2;
     270                LayoutUnit centerY = (usableHeight - image->height()) / 2;
    271271                if (centerY < 0)
    272272                    centerY = 0;
    273                 imageOffset = IntSize(leftBorder + leftPad + centerX + 1, topBorder + topPad + centerY + 1);
     273                imageOffset = LayoutSize(leftBorder + leftPad + centerX + 1, topBorder + topPad + centerY + 1);
    274274                context->drawImage(image.get(), style()->colorSpace(), paintOffset + imageOffset);
    275275                errorPictureDrawn = true;
    … …  
    281281                const Font& font = style()->font();
    282282                const FontMetrics& fontMetrics = font.fontMetrics();
    283                 int ascent = fontMetrics.ascent();
    284                 IntPoint altTextOffset = paintOffset;
     283                LayoutUnit ascent = fontMetrics.ascent();
     284                LayoutPoint altTextOffset = paintOffset;
    285285                altTextOffset.move(leftBorder + leftPad, topBorder + topPad + ascent);
    286286
    … …  
    288288                // and only if it fits above the error image.
    289289                TextRun textRun = RenderBlock::constructTextRun(this, font, text, style());
    290                 int textWidth = font.width(textRun);
     290                LayoutUnit textWidth = font.width(textRun);
    291291                if (errorPictureDrawn) {
    292292                    if (usableWidth >= textWidth && fontMetrics.height() <= imageOffset.height())
    … …  
    306306#endif
    307307
    308         IntSize contentSize(cWidth, cHeight);
    309         IntPoint contentLocation = paintOffset;
     308        LayoutSize contentSize(cWidth, cHeight);
     309        LayoutPoint contentLocation = paintOffset;
    310310        contentLocation.move(leftBorder + leftPad, topBorder + topPad);
    311         paintIntoRect(context, IntRect(contentLocation, contentSize));
     311        paintIntoRect(context, LayoutRect(contentLocation, contentSize));
    312312    }
    313313}

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

    r88319 r89983  
    7777    virtual bool isRenderImage() const { return true; }
    7878
    79     virtual void paintReplaced(PaintInfo&, const IntPoint&);
     79    virtual void paintReplaced(PaintInfo&, const LayoutPoint&);
    8080
    8181    virtual int minimumReplacedHeight() const;

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

    r89733 r89983  
    262262}
    263263   
    264 void RenderListBox::paintObject(PaintInfo& paintInfo, const IntPoint& paintOffset)
     264void RenderListBox::paintObject(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
    265265{
    266266    if (style()->visibility() != VISIBLE)

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

    r88982 r89983  
    6666
    6767    virtual bool hasControlClip() const { return true; }
    68     virtual void paintObject(PaintInfo&, const IntPoint&);
     68    virtual void paintObject(PaintInfo&, const LayoutPoint&);
    6969    virtual IntRect controlClipRect(const IntPoint&) const;
    7070

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

    r88913 r89983  
    7171    int calcAspectRatioLogicalHeight() const;
    7272
    73     virtual void paintReplaced(PaintInfo&, const IntPoint&) { }
     73    virtual void paintReplaced(PaintInfo&, const LayoutPoint&) { }
    7474
    7575    virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer);

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

    r89979 r89983  
    473473}
    474474
    475 void RenderTable::paintObject(PaintInfo& paintInfo, const IntPoint& paintOffset)
     475void RenderTable::paintObject(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
    476476{
    477477    PaintPhase paintPhase = paintInfo.phase;
    … …  
    498498    for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
    499499        if (child->isBox() && !toRenderBox(child)->hasSelfPaintingLayer() && (child->isTableSection() || child == m_caption)) {
    500             IntPoint childPoint = flipForWritingMode(toRenderBox(child), paintOffset, ParentToChildFlippingAdjustment);
     500            LayoutPoint childPoint = flipForWritingMode(toRenderBox(child), paintOffset, ParentToChildFlippingAdjustment);
    501501            child->paint(info, childPoint);
    502502        }
    … …  
    520520            for (RenderObject* child = firstChild(); child; child = child->nextSibling())
    521521                if (child->isTableSection()) {
    522                     IntPoint childPoint = flipForWritingMode(toRenderTableSection(child), paintOffset, ParentToChildFlippingAdjustment);
     522                    LayoutPoint childPoint = flipForWritingMode(toRenderTableSection(child), paintOffset, ParentToChildFlippingAdjustment);
    523523                    child->paint(info, childPoint);
    524524                }
    … …  
    529529    // Paint outline.
    530530    if ((paintPhase == PaintPhaseOutline || paintPhase == PaintPhaseSelfOutline) && hasOutline() && style()->visibility() == VISIBLE)
    531         paintOutline(paintInfo.context, IntRect(paintOffset, size()));
     531        paintOutline(paintInfo.context, LayoutRect(paintOffset, size()));
    532532}
    533533

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

    r89974 r89983  
    216216
    217217    virtual void paint(PaintInfo&, const IntPoint&);
    218     virtual void paintObject(PaintInfo&, const IntPoint&);
     218    virtual void paintObject(PaintInfo&, const LayoutPoint&);
    219219    virtual void paintBoxDecorations(PaintInfo&, const IntPoint&);
    220220    virtual void paintMask(PaintInfo&, const LayoutPoint&);

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

    r88319 r89983  
    948948}
    949949
    950 void RenderTableSection::paintObject(PaintInfo& paintInfo, const IntPoint& paintOffset)
     950void RenderTableSection::paintObject(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
    951951{
    952952    // Check which rows and cols are visible and only paint these.
    … …  
    957957    PaintPhase paintPhase = paintInfo.phase;
    958958
    959     int os = 2 * maximalOutlineSize(paintPhase);
     959    LayoutUnit os = 2 * maximalOutlineSize(paintPhase);
    960960    unsigned startrow = 0;
    961961    unsigned endrow = totalRows;
    962962
    963     IntRect localRepaintRect = paintInfo.rect;
     963    LayoutRect localRepaintRect = paintInfo.rect;
    964964    localRepaintRect.moveBy(-paintOffset);
    965965    if (style()->isFlippedBlocksWritingMode()) {
    … …  
    972972    // If some cell overflows, just paint all of them.
    973973    if (!m_hasOverflowingCell) {
    974         int before = (style()->isHorizontalWritingMode() ? localRepaintRect.y() : localRepaintRect.x()) - os;
     974        LayoutUnit before = (style()->isHorizontalWritingMode() ? localRepaintRect.y() : localRepaintRect.x()) - os;
    975975        // binary search to find a row
    976976        startrow = std::lower_bound(m_rowPos.begin(), m_rowPos.end(), before) - m_rowPos.begin();
    … …  
    982982          --startrow;
    983983
    984         int after = (style()->isHorizontalWritingMode() ? localRepaintRect.maxY() : localRepaintRect.maxX()) + os;
     984        LayoutUnit after = (style()->isHorizontalWritingMode() ? localRepaintRect.maxY() : localRepaintRect.maxX()) + os;
    985985        endrow = std::lower_bound(m_rowPos.begin(), m_rowPos.end(), after) - m_rowPos.begin();
    986986        if (endrow == m_rowPos.size())
    … …  
    995995    // FIXME: Implement RTL.
    996996    if (!m_hasOverflowingCell && style()->isLeftToRightDirection()) {
    997         int start = (style()->isHorizontalWritingMode() ? localRepaintRect.x() : localRepaintRect.y()) - os;
     997        LayoutUnit start = (style()->isHorizontalWritingMode() ? localRepaintRect.x() : localRepaintRect.y()) - os;
    998998        Vector<int>& columnPos = table()->columnPositions();
    999999        startcol = std::lower_bound(columnPos.begin(), columnPos.end(), start) - columnPos.begin();
    … …  
    10011001            --startcol;
    10021002
    1003         int end = (style()->isHorizontalWritingMode() ? localRepaintRect.maxX() : localRepaintRect.maxY()) + os;
     1003        LayoutUnit end = (style()->isHorizontalWritingMode() ? localRepaintRect.maxX() : localRepaintRect.maxY()) + os;
    10041004        endcol = std::lower_bound(columnPos.begin(), columnPos.end(), end) - columnPos.begin();
    10051005        if (endcol == columnPos.size())

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

    r88319 r89983  
    135135    virtual void paint(PaintInfo&, const IntPoint&);
    136136    virtual void paintCell(RenderTableCell*, PaintInfo&, const IntPoint&);
    137     virtual void paintObject(PaintInfo&, const IntPoint&);
     137    virtual void paintObject(PaintInfo&, const LayoutPoint&);
    138138
    139139    virtual void imageChanged(WrappedImagePtr, const IntRect* = 0);

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

    r89950 r89983  
    633633}
    634634
    635 void RenderTextControl::paintObject(PaintInfo& paintInfo, const IntPoint& paintOffset)
     635void RenderTextControl::paintObject(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
    636636{   
    637637    if (m_placeholderVisible && paintInfo.phase == PaintPhaseForeground)

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

    r89913 r89983  
    9191    virtual bool canHaveChildren() const { return false; }
    9292    virtual bool avoidsFloats() const { return true; }
    93     virtual void paintObject(PaintInfo&, const IntPoint&);
     93    virtual void paintObject(PaintInfo&, const LayoutPoint&);
    9494   
    9595    virtual void addFocusRingRects(Vector<IntRect>&, const IntPoint&);

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

    r89977 r89983  
    189189}
    190190
    191 void RenderVideo::paintReplaced(PaintInfo& paintInfo, const IntPoint& paintOffset)
     191void RenderVideo::paintReplaced(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
    192192{
    193193    MediaPlayer* mediaPlayer = mediaElement()->player();
    … …  
    200200    }
    201201
    202     IntRect rect = videoBox();
     202    LayoutRect rect = videoBox();
    203203    if (rect.isEmpty())
    204204        return;

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

    r89977 r89983  
    6767    virtual bool isVideo() const { return true; }
    6868
    69     virtual void paintReplaced(PaintInfo&, const IntPoint&);
     69    virtual void paintReplaced(PaintInfo&, const LayoutPoint&);
    7070
    7171    virtual void layout();
Note: See TracChangeset for help on using the changeset viewer.