| Index: Source/core/rendering/RenderBoxModelObject.cpp
|
| diff --git a/Source/core/rendering/RenderBoxModelObject.cpp b/Source/core/rendering/RenderBoxModelObject.cpp
|
| index fdc55403ab6f3c5977042dab4252e2b8dc4398a5..f5bab54205a3a49c69af3ef22eb10634662d8c99 100644
|
| --- a/Source/core/rendering/RenderBoxModelObject.cpp
|
| +++ b/Source/core/rendering/RenderBoxModelObject.cpp
|
| @@ -651,7 +651,7 @@ void RenderBoxModelObject::paintFillLayerExtended(const PaintInfo& paintInfo, co
|
| // First figure out how big the mask has to be. It should be no bigger than what we need
|
| // to actually render, so we should intersect the dirty rect with the border box of the background.
|
| maskRect = pixelSnappedIntRect(rect);
|
| - maskRect.intersect(paintInfo.rect);
|
| + maskRect.intersect(paintInfo.rect());
|
|
|
| // We draw the background into a separate layer, to be later masked with yet another layer
|
| // holding the text content.
|
| @@ -704,7 +704,7 @@ void RenderBoxModelObject::paintFillLayerExtended(const PaintInfo& paintInfo, co
|
| bool boxShadowShouldBeAppliedToBackground = this->boxShadowShouldBeAppliedToBackground(bleedAvoidance, box);
|
| if (boxShadowShouldBeAppliedToBackground || !shouldPaintBackgroundImage || !bgLayer->hasOpaqueImage(this) || !bgLayer->hasRepeatXY()) {
|
| if (!boxShadowShouldBeAppliedToBackground)
|
| - backgroundRect.intersect(paintInfo.rect);
|
| + backgroundRect.intersect(paintInfo.rect());
|
|
|
| // If we have an alpha and we are painting the root element, go ahead and blend with the base background color.
|
| Color baseColor;
|
| @@ -736,7 +736,7 @@ void RenderBoxModelObject::paintFillLayerExtended(const PaintInfo& paintInfo, co
|
| if (shouldPaintBackgroundImage) {
|
| BackgroundImageGeometry geometry;
|
| calculateBackgroundImageGeometry(bgLayer, scrolledPaintRect, geometry, backgroundObject);
|
| - geometry.clip(paintInfo.rect);
|
| + geometry.clip(paintInfo.rect());
|
| if (!geometry.destRect().isEmpty()) {
|
| CompositeOperator compositeOp = op == CompositeSourceOver ? bgLayer->composite() : op;
|
| RenderObject* clientForBackgroundImage = backgroundObject ? backgroundObject : this;
|
| @@ -1752,7 +1752,7 @@ void RenderBoxModelObject::paintBorder(const PaintInfo& info, const LayoutRect&
|
|
|
| // If no corner intersects the clip region, we can pretend outerBorder is
|
| // rectangular to improve performance.
|
| - if (haveAllSolidEdges && outerBorder.isRounded() && allCornersClippedOut(outerBorder, info.rect))
|
| + if (haveAllSolidEdges && outerBorder.isRounded() && allCornersClippedOut(outerBorder, info.rect()))
|
| outerBorder.setRadii(RoundedRect::Radii());
|
|
|
| // isRenderable() check avoids issue described in https://bugs.webkit.org/show_bug.cgi?id=38787
|
| @@ -2521,7 +2521,7 @@ void RenderBoxModelObject::paintBoxShadow(const PaintInfo& info, const LayoutRec
|
| if (hasBorderRadius) {
|
| RoundedRect influenceRect(shadowRect, border.radii());
|
| influenceRect.expandRadii(2 * shadowBlur + shadowSpread);
|
| - if (allCornersClippedOut(influenceRect, info.rect))
|
| + if (allCornersClippedOut(influenceRect, info.rect()))
|
| context->fillRect(fillRect.rect(), Color::black);
|
| else {
|
| fillRect.expandRadii(shadowSpread);
|
|
|