Changeset 86303 in webkit


Ignore:
Timestamp:
May 11, 2011 8:17:57 PM (13 years ago)
Author:
leviw@chromium.org
Message:

2011-05-11 Levi Weintraub <​leviw@chromium.org>

Reviewed by Eric Seidel.

Switch paintFillLayer and its progeny to use IntRect instead of four ints
​https://bugs.webkit.org/show_bug.cgi?id=60596

Changing integers passed into paintFillLayer and other derivatives to IntRects
and IntSizes that reflect their function.

No new tests since this is just refactoring.

  • rendering/InlineFlowBox.cpp: (WebCore::InlineFlowBox::paintFillLayers): (WebCore::InlineFlowBox::paintFillLayer): (WebCore::InlineFlowBox::paintBoxDecorations): (WebCore::InlineFlowBox::paintMask):
  • rendering/InlineFlowBox.h:
  • rendering/RenderBox.cpp: (WebCore::RenderBox::paintRootBoxFillLayers): (WebCore::RenderBox::paintBoxDecorationsWithSize): (WebCore::RenderBox::paintMaskImages): (WebCore::RenderBox::paintFillLayers): (WebCore::RenderBox::paintFillLayer):
  • rendering/RenderBox.h:
  • rendering/RenderBoxModelObject.cpp: (WebCore::RenderBoxModelObject::paintFillLayerExtended):
  • rendering/RenderBoxModelObject.h:
  • rendering/RenderFieldset.cpp: (WebCore::RenderFieldset::paintBoxDecorations):
  • rendering/RenderTable.cpp: (WebCore::RenderTable::paintBoxDecorations):
  • rendering/RenderTableCell.cpp: (WebCore::RenderTableCell::paintBackgroundsBehindCell):
Location:
trunk/Source/WebCore
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r86301 r86303  
     12011-05-11  Levi Weintraub  <leviw@chromium.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Switch paintFillLayer and its progeny to use IntRect instead of four ints
     6        https://bugs.webkit.org/show_bug.cgi?id=60596
     7
     8        Changing integers passed into paintFillLayer and other derivatives to IntRects
     9        and IntSizes that reflect their function.
     10
     11        No new tests since this is just refactoring.
     12
     13        * rendering/InlineFlowBox.cpp:
     14        (WebCore::InlineFlowBox::paintFillLayers):
     15        (WebCore::InlineFlowBox::paintFillLayer):
     16        (WebCore::InlineFlowBox::paintBoxDecorations):
     17        (WebCore::InlineFlowBox::paintMask):
     18        * rendering/InlineFlowBox.h:
     19        * rendering/RenderBox.cpp:
     20        (WebCore::RenderBox::paintRootBoxFillLayers):
     21        (WebCore::RenderBox::paintBoxDecorationsWithSize):
     22        (WebCore::RenderBox::paintMaskImages):
     23        (WebCore::RenderBox::paintFillLayers):
     24        (WebCore::RenderBox::paintFillLayer):
     25        * rendering/RenderBox.h:
     26        * rendering/RenderBoxModelObject.cpp:
     27        (WebCore::RenderBoxModelObject::paintFillLayerExtended):
     28        * rendering/RenderBoxModelObject.h:
     29        * rendering/RenderFieldset.cpp:
     30        (WebCore::RenderFieldset::paintBoxDecorations):
     31        * rendering/RenderTable.cpp:
     32        (WebCore::RenderTable::paintBoxDecorations):
     33        * rendering/RenderTableCell.cpp:
     34        (WebCore::RenderTableCell::paintBackgroundsBehindCell):
     35
    1362011-05-11  Nat Duca  <nduca@chromium.org>
    237

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

    r86272 r86303  
    10171017}
    10181018
    1019 void InlineFlowBox::paintFillLayers(const PaintInfo& paintInfo, const Color& c, const FillLayer* fillLayer, int _tx, int _ty, int w, int h, CompositeOperator op)
     1019void InlineFlowBox::paintFillLayers(const PaintInfo& paintInfo, const Color& c, const FillLayer* fillLayer, const IntRect& rect, CompositeOperator op)
    10201020{
    10211021    if (!fillLayer)
    10221022        return;
    1023     paintFillLayers(paintInfo, c, fillLayer->next(), _tx, _ty, w, h, op);
    1024     paintFillLayer(paintInfo, c, fillLayer, _tx, _ty, w, h, op);
    1025 }
    1026 
    1027 void InlineFlowBox::paintFillLayer(const PaintInfo& paintInfo, const Color& c, const FillLayer* fillLayer, int tx, int ty, int w, int h, CompositeOperator op)
     1023    paintFillLayers(paintInfo, c, fillLayer->next(), rect, op);
     1024    paintFillLayer(paintInfo, c, fillLayer, rect, op);
     1025}
     1026
     1027void InlineFlowBox::paintFillLayer(const PaintInfo& paintInfo, const Color& c, const FillLayer* fillLayer, const IntRect& rect, CompositeOperator op)
    10281028{
    10291029    StyleImage* img = fillLayer->image();
    10301030    bool hasFillImage = img && img->canRender(renderer()->style()->effectiveZoom());
    10311031    if ((!hasFillImage && !renderer()->style()->hasBorderRadius()) || (!prevLineBox() && !nextLineBox()) || !parent())
    1032         boxModelObject()->paintFillLayerExtended(paintInfo, c, fillLayer, tx, ty, w, h, BackgroundBleedNone, this, w, h, op);
     1032        boxModelObject()->paintFillLayerExtended(paintInfo, c, fillLayer, rect, BackgroundBleedNone, this, rect.size(), op);
    10331033    else {
    10341034        // We have a fill image that spans multiple lines.
    … …  
    10531053                totalLogicalWidth += curr->logicalWidth();
    10541054        }
    1055         int stripX = tx - (isHorizontal() ? logicalOffsetOnLine : 0);
    1056         int stripY = ty - (isHorizontal() ? 0 : logicalOffsetOnLine);
     1055        int stripX = rect.x() - (isHorizontal() ? logicalOffsetOnLine : 0);
     1056        int stripY = rect.y() - (isHorizontal() ? 0 : logicalOffsetOnLine);
    10571057        int stripWidth = isHorizontal() ? totalLogicalWidth : width();
    10581058        int stripHeight = isHorizontal() ? height() : totalLogicalWidth;
    10591059
    10601060        GraphicsContextStateSaver stateSaver(*paintInfo.context);
    1061         paintInfo.context->clip(IntRect(tx, ty, width(), height()));
    1062         boxModelObject()->paintFillLayerExtended(paintInfo, c, fillLayer, stripX, stripY, stripWidth, stripHeight, BackgroundBleedNone, this, w, h, op);
     1061        paintInfo.context->clip(IntRect(rect.x(), rect.y(), width(), height()));
     1062        boxModelObject()->paintFillLayerExtended(paintInfo, c, fillLayer, IntRect(stripX, stripY, stripWidth, stripHeight), BackgroundBleedNone, this, rect.size(), op);
    10631063    }
    10641064}
    … …  
    11141114
    11151115        Color c = styleToUse->visitedDependentColor(CSSPropertyBackgroundColor);
    1116         paintFillLayers(paintInfo, c, styleToUse->backgroundLayers(), tx, ty, w, h);
     1116        paintFillLayers(paintInfo, c, styleToUse->backgroundLayers(), IntRect(tx, ty, w, h));
    11171117        paintBoxShadow(context, styleToUse, Inset, tx, ty, w, h);
    11181118
    … …  
    12051205    }
    12061206
    1207     paintFillLayers(paintInfo, Color(), renderer()->style()->maskLayers(), tx, ty, w, h, compositeOp);
     1207    paintFillLayers(paintInfo, Color(), renderer()->style()->maskLayers(), IntRect(tx, ty, w, h), compositeOp);
    12081208   
    12091209    bool hasBoxImage = maskBoxImage && maskBoxImage->canRender(renderer()->style()->effectiveZoom());

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

    r85512 r86303  
    106106    virtual void paintBoxDecorations(PaintInfo&, int tx, int ty);
    107107    virtual void paintMask(PaintInfo&, int tx, int ty);
    108     void paintFillLayers(const PaintInfo&, const Color&, const FillLayer*, int tx, int ty, int w, int h, CompositeOperator = CompositeSourceOver);
    109     void paintFillLayer(const PaintInfo&, const Color&, const FillLayer*, int tx, int ty, int w, int h, CompositeOperator = CompositeSourceOver);
     108    void paintFillLayers(const PaintInfo&, const Color&, const FillLayer*, const IntRect&, CompositeOperator = CompositeSourceOver);
     109    void paintFillLayer(const PaintInfo&, const Color&, const FillLayer*, const IntRect&, CompositeOperator = CompositeSourceOver);
    110110    void paintBoxShadow(GraphicsContext*, RenderStyle*, ShadowStyle, int tx, int ty, int w, int h);
    111111    virtual void paint(PaintInfo&, int tx, int ty, int lineTop, int lineBottom);

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

    r86272 r86303  
    800800    // The background of the box generated by the root element covers the entire canvas, so just use
    801801    // the RenderView's docTop/Left/Width/Height accessors.
    802     paintFillLayers(paintInfo, bgColor, bgLayer, view()->docLeft(), view()->docTop(), view()->docWidth(), view()->docHeight(), BackgroundBleedNone, CompositeSourceOver, bodyObject);
     802    paintFillLayers(paintInfo, bgColor, bgLayer, view()->documentRect(), BackgroundBleedNone, CompositeSourceOver, bodyObject);
    803803}
    804804
    … …  
    835835void RenderBox::paintBoxDecorationsWithSize(PaintInfo& paintInfo, int tx, int ty, int width, int height)
    836836{
     837    IntRect paintRect = IntRect(tx, ty, width, height);
    837838    // border-fit can adjust where we paint our border and background.  If set, we snugly fit our line box descendants.  (The iChat
    838839    // balloon layout is an example of this).
    … …  
    850851        // into a transparency layer, and then clip that in one go (which requires setting up the clip before
    851852        // beginning the layer).
    852         RoundedIntRect border = style()->getRoundedBorderFor(IntRect(tx, ty, width, height));
     853        RoundedIntRect border = style()->getRoundedBorderFor(paintRect);
    853854        stateSaver.save();
    854855        paintInfo.context->addRoundedRectClip(border);
    … …  
    858859    // If we have a native theme appearance, paint that before painting our background.
    859860    // The theme will tell us whether or not we should also paint the CSS background.
    860     bool themePainted = style()->hasAppearance() && !theme()->paint(this, paintInfo, IntRect(tx, ty, width, height));
     861    bool themePainted = style()->hasAppearance() && !theme()->paint(this, paintInfo, paintRect);
    861862    if (!themePainted) {
    862863        if (isRoot())
    … …  
    865866            // The <body> only paints its background if the root element has defined a background
    866867            // independent of the body.
    867             paintFillLayers(paintInfo, style()->visitedDependentColor(CSSPropertyBackgroundColor), style()->backgroundLayers(), tx, ty, width, height, bleedAvoidance);
     868            paintFillLayers(paintInfo, style()->visitedDependentColor(CSSPropertyBackgroundColor), style()->backgroundLayers(), paintRect, bleedAvoidance);
    868869        }
    869870        if (style()->hasAppearance())
    870             theme()->paintDecorations(this, paintInfo, IntRect(tx, ty, width, height));
     871            theme()->paintDecorations(this, paintInfo, paintRect);
    871872    }
    872873    paintBoxShadow(paintInfo.context, tx, ty, width, height, style(), Inset);
    873874
    874875    // The theme will tell us whether or not we should also paint the CSS border.
    875     if ((!style()->hasAppearance() || (!themePainted && theme()->paintBorderOnly(this, paintInfo, IntRect(tx, ty, width, height)))) && style()->hasBorder())
     876    if ((!style()->hasAppearance() || (!themePainted && theme()->paintBorderOnly(this, paintInfo, paintRect))) && style()->hasBorder())
    876877        paintBorder(paintInfo.context, IntRect(tx, ty, width, height), style(), bleedAvoidance);
    877878
    … …  
    953954
    954955    if (allMaskImagesLoaded) {
    955         paintFillLayers(paintInfo, Color(), style()->maskLayers(), tx, ty, w, h, BackgroundBleedNone, compositeOp);
    956         paintNinePieceImage(paintInfo.context, IntRect(tx, ty, w, h), style(), style()->maskBoxImage(), compositeOp);
     956        IntRect paintRect = IntRect(tx, ty, w, h);
     957        paintFillLayers(paintInfo, Color(), style()->maskLayers(), paintRect, BackgroundBleedNone, compositeOp);
     958        paintNinePieceImage(paintInfo.context, paintRect, style(), style()->maskBoxImage(), compositeOp);
    957959    }
    958960   
    … …  
    980982}
    981983
    982 void RenderBox::paintFillLayers(const PaintInfo& paintInfo, const Color& c, const FillLayer* fillLayer, int tx, int ty, int width, int height,
     984void RenderBox::paintFillLayers(const PaintInfo& paintInfo, const Color& c, const FillLayer* fillLayer, const IntRect& rect,
    983985    BackgroundBleedAvoidance bleedAvoidance, CompositeOperator op, RenderObject* backgroundObject)
    984986{
    … …  
    986988        return;
    987989
    988     paintFillLayers(paintInfo, c, fillLayer->next(), tx, ty, width, height, bleedAvoidance, op, backgroundObject);
    989     paintFillLayer(paintInfo, c, fillLayer, tx, ty, width, height, bleedAvoidance, op, backgroundObject);
    990 }
    991 
    992 void RenderBox::paintFillLayer(const PaintInfo& paintInfo, const Color& c, const FillLayer* fillLayer, int tx, int ty, int width, int height,
     990    paintFillLayers(paintInfo, c, fillLayer->next(), rect, bleedAvoidance, op, backgroundObject);
     991    paintFillLayer(paintInfo, c, fillLayer, rect, bleedAvoidance, op, backgroundObject);
     992}
     993
     994void RenderBox::paintFillLayer(const PaintInfo& paintInfo, const Color& c, const FillLayer* fillLayer, const IntRect& rect,
    993995    BackgroundBleedAvoidance bleedAvoidance, CompositeOperator op, RenderObject* backgroundObject)
    994996{
    995     paintFillLayerExtended(paintInfo, c, fillLayer, tx, ty, width, height, bleedAvoidance, 0, 0, 0, op, backgroundObject);
     997    paintFillLayerExtended(paintInfo, c, fillLayer, rect, bleedAvoidance, 0, IntSize(), op, backgroundObject);
    996998}
    997999

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

    r86197 r86303  
    406406    virtual void updateBoxModelInfoFromStyle();
    407407
    408     void paintFillLayer(const PaintInfo&, const Color&, const FillLayer*, int tx, int ty, int width, int height, BackgroundBleedAvoidance, CompositeOperator, RenderObject* backgroundObject);
    409     void paintFillLayers(const PaintInfo&, const Color&, const FillLayer*, int tx, int ty, int width, int height, BackgroundBleedAvoidance = BackgroundBleedNone, CompositeOperator = CompositeSourceOver, RenderObject* backgroundObject = 0);
     408    void paintFillLayer(const PaintInfo&, const Color&, const FillLayer*, const IntRect&, BackgroundBleedAvoidance, CompositeOperator, RenderObject* backgroundObject);
     409    void paintFillLayers(const PaintInfo&, const Color&, const FillLayer*, const IntRect&, BackgroundBleedAvoidance = BackgroundBleedNone, CompositeOperator = CompositeSourceOver, RenderObject* backgroundObject = 0);
    410410
    411411    void paintBoxDecorationsWithSize(PaintInfo&, int tx, int ty, int width, int height);

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

    r86272 r86303  
    586586}
    587587
    588 void RenderBoxModelObject::paintFillLayerExtended(const PaintInfo& paintInfo, const Color& color, const FillLayer* bgLayer, int tx, int ty, int w, int h,
    589     BackgroundBleedAvoidance bleedAvoidance, InlineFlowBox* box, int inlineBoxWidth, int inlineBoxHeight, CompositeOperator op, RenderObject* backgroundObject)
     588void RenderBoxModelObject::paintFillLayerExtended(const PaintInfo& paintInfo, const Color& color, const FillLayer* bgLayer, const IntRect& rect,
     589    BackgroundBleedAvoidance bleedAvoidance, InlineFlowBox* box, const IntSize& boxSize, CompositeOperator op, RenderObject* backgroundObject)
    590590{
    591591    GraphicsContext* context = paintInfo.context;
    592     if (context->paintingDisabled())
    593         return;
    594 
    595     IntRect borderRect(tx, ty, w, h);
    596     if (borderRect.isEmpty())
     592    if (context->paintingDisabled() || rect.isEmpty())
    597593        return;
    598594
    … …  
    632628
    633629        if (hasRoundedBorder && bleedAvoidance != BackgroundBleedUseTransparencyLayer) {
    634             RoundedIntRect border = getBackgroundRoundedRect(backgroundRectAdjustedForBleedAvoidance(context, borderRect, bleedAvoidance), box, inlineBoxWidth, inlineBoxHeight, includeLeftEdge, includeRightEdge);
     630            RoundedIntRect border = getBackgroundRoundedRect(backgroundRectAdjustedForBleedAvoidance(context, rect, bleedAvoidance), box, boxSize.width(), boxSize.height(), includeLeftEdge, includeRightEdge);
    635631            context->fillRoundedRect(border, bgColor, style()->colorSpace());
    636632        } else
    637             context->fillRect(borderRect, bgColor, style()->colorSpace());
     633            context->fillRect(rect, bgColor, style()->colorSpace());
    638634       
    639635        return;
    … …  
    643639    GraphicsContextStateSaver clipToBorderStateSaver(*context, clipToBorderRadius);
    644640    if (clipToBorderRadius) {
    645         RoundedIntRect border = getBackgroundRoundedRect(backgroundRectAdjustedForBleedAvoidance(context, borderRect, bleedAvoidance), box, inlineBoxWidth, inlineBoxHeight, includeLeftEdge, includeRightEdge);
     641        RoundedIntRect border = getBackgroundRoundedRect(backgroundRectAdjustedForBleedAvoidance(context, rect, bleedAvoidance), box, boxSize.width(), boxSize.height(), includeLeftEdge, includeRightEdge);
    646642        context->addRoundedRectClip(border);
    647643    }
    … …  
    653649
    654650    GraphicsContextStateSaver clipWithScrollingStateSaver(*context, clippedWithLocalScrolling);
     651    IntRect scrolledPaintRect = rect;
    655652    if (clippedWithLocalScrolling) {
    656653        // Clip to the overflow area.
    657         context->clip(toRenderBox(this)->overflowClipRect(tx, ty));
     654        context->clip(toRenderBox(this)->overflowClipRect(rect.x(), rect.y()));
    658655       
    659         // Now adjust our tx, ty, w, h to reflect a scrolled content box with borders at the ends.
     656        // Adjust the paint rect to reflect a scrolled content box with borders at the ends.
    660657        IntSize offset = layer()->scrolledContentOffset();
    661         tx -= offset.width();
    662         ty -= offset.height();
    663         w = bLeft + layer()->scrollWidth() + bRight;
    664         h = borderTop() + layer()->scrollHeight() + borderBottom();
     658        scrolledPaintRect.move(-offset);
     659        scrolledPaintRect.setWidth(bLeft + layer()->scrollWidth() + bRight);
     660        scrolledPaintRect.setHeight(borderTop() + layer()->scrollHeight() + borderBottom());
    665661    }
    666662   
    … …  
    669665        // Clip to the padding or content boxes as necessary.
    670666        bool includePadding = bgLayer->clip() == ContentFillBox;
    671         int x = tx + bLeft + (includePadding ? pLeft : 0);
    672         int y = ty + borderTop() + (includePadding ? paddingTop() : 0);
    673         int width = w - bLeft - bRight - (includePadding ? pLeft + pRight : 0);
    674         int height = h - borderTop() - borderBottom() - (includePadding ? paddingTop() + paddingBottom() : 0);
     667        IntRect clipRect = IntRect(scrolledPaintRect.x() + bLeft + (includePadding ? pLeft : 0),
     668                                   scrolledPaintRect.y() + borderTop() + (includePadding ? paddingTop() : 0),
     669                                   scrolledPaintRect.width() - bLeft - bRight - (includePadding ? pLeft + pRight : 0),
     670                                   scrolledPaintRect.height() - borderTop() - borderBottom() - (includePadding ? paddingTop() + paddingBottom() : 0));
    675671        backgroundClipStateSaver.save();
    676         context->clip(IntRect(x, y, width, height));
     672        context->clip(clipRect);
    677673    } else if (bgLayer->clip() == TextFillBox) {
    678674        // We have to draw our text into a mask that can then be used to clip background drawing.
    679675        // First figure out how big the mask has to be.  It should be no bigger than what we need
    680676        // to actually render, so we should intersect the dirty rect with the border box of the background.
    681         IntRect maskRect(tx, ty, w, h);
     677        IntRect maskRect = rect;
    682678        maskRect.intersect(paintInfo.rect);
    683679       
    … …  
    695691        if (box) {
    696692            RootInlineBox* root = box->root();
    697             box->paint(info, tx - box->x(), ty - box->y(), root->lineTop(), root->lineBottom());
     693            box->paint(info, scrolledPaintRect.x() - box->x(), scrolledPaintRect.y() - box->y(), root->lineTop(), root->lineBottom());
    698694        } else {
    699695            int x = isBox() ? toRenderBox(this)->x() : 0;
    700696            int y = isBox() ? toRenderBox(this)->y() : 0;
    701             paint(info, tx - x, ty - y);
     697            paint(info, scrolledPaintRect.x() - x, scrolledPaintRect.y() - y);
    702698        }
    703699       
    … …  
    740736    // Paint the color first underneath all images.
    741737    if (!bgLayer->next()) {
    742         IntRect rect(tx, ty, w, h);
    743         rect.intersect(paintInfo.rect);
     738        IntRect backgroundRect(scrolledPaintRect);
     739        backgroundRect.intersect(paintInfo.rect);
    744740        // If we have an alpha and we are painting the root element, go ahead and blend with the base background color.
    745741        if (isOpaqueRoot) {
    … …  
    748744                CompositeOperator previousOperator = context->compositeOperation();
    749745                context->setCompositeOperation(CompositeCopy);
    750                 context->fillRect(rect, baseColor, style()->colorSpace());
     746                context->fillRect(backgroundRect, baseColor, style()->colorSpace());
    751747                context->setCompositeOperation(previousOperator);
    752748            } else
    753                 context->clearRect(rect);
     749                context->clearRect(backgroundRect);
    754750        }
    755751
    756752        if (bgColor.isValid() && bgColor.alpha() > 0)
    757             context->fillRect(rect, bgColor, style()->colorSpace());
     753            context->fillRect(backgroundRect, bgColor, style()->colorSpace());
    758754    }
    759755
    … …  
    764760        IntSize tileSize;
    765761
    766         calculateBackgroundImageGeometry(bgLayer, tx, ty, w, h, destRect, phase, tileSize);
     762        calculateBackgroundImageGeometry(bgLayer, scrolledPaintRect.x(), scrolledPaintRect.y(), scrolledPaintRect.width(), scrolledPaintRect.height(), destRect, phase, tileSize);
    767763        IntPoint destOrigin = destRect.location();
    768764        destRect.intersect(paintInfo.rect);

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

    r86272 r86303  
    122122    bool paintNinePieceImage(GraphicsContext*, const IntRect&, const RenderStyle*, const NinePieceImage&, CompositeOperator = CompositeSourceOver);
    123123    void paintBoxShadow(GraphicsContext*, int tx, int ty, int w, int h, const RenderStyle*, ShadowStyle, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true);
    124     void paintFillLayerExtended(const PaintInfo&, const Color&, const FillLayer*, int tx, int ty, int width, int height, BackgroundBleedAvoidance, InlineFlowBox* = 0, int inlineBoxWidth = 0, int inlineBoxHeight = 0, CompositeOperator = CompositeSourceOver, RenderObject* backgroundObject = 0);
     124    void paintFillLayerExtended(const PaintInfo&, const Color&, const FillLayer*, const IntRect&, BackgroundBleedAvoidance, InlineFlowBox* = 0, const IntSize& = IntSize(), CompositeOperator = CompositeSourceOver, RenderObject* backgroundObject = 0);
    125125   
    126126    // Overridden by subclasses to determine line height and baseline position.

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

    r86272 r86303  
    145145    paintBoxShadow(paintInfo.context, tx, ty, w, h, style(), Normal);
    146146
    147     paintFillLayers(paintInfo, style()->visitedDependentColor(CSSPropertyBackgroundColor), style()->backgroundLayers(), tx, ty, w, h);
     147    paintFillLayers(paintInfo, style()->visitedDependentColor(CSSPropertyBackgroundColor), style()->backgroundLayers(), IntRect(tx, ty, w, h));
    148148    paintBoxShadow(paintInfo.context, tx, ty, w, h, style(), Inset);
    149149

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

    r86272 r86303  
    566566        // The <body> only paints its background if the root element has defined a background
    567567        // independent of the body.
    568         paintFillLayers(paintInfo, style()->visitedDependentColor(CSSPropertyBackgroundColor), style()->backgroundLayers(), rect.x(), rect.y(), rect.width(), rect.height());
     568        paintFillLayers(paintInfo, style()->visitedDependentColor(CSSPropertyBackgroundColor), style()->backgroundLayers(), rect);
    569569
    570570    paintBoxShadow(paintInfo.context, rect.x(), rect.y(), rect.width(), rect.height(), style(), Inset);

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

    r86272 r86303  
    995995            paintInfo.context->clip(clipRect);
    996996        }
    997         paintFillLayers(paintInfo, c, bgLayer, tx, ty, w, h, BackgroundBleedNone, CompositeSourceOver, backgroundObject);
     997        paintFillLayers(paintInfo, c, bgLayer, IntRect(tx, ty, w, h), BackgroundBleedNone, CompositeSourceOver, backgroundObject);
    998998    }
    999999}
Note: See TracChangeset for help on using the changeset viewer.