| Index: sky/engine/core/rendering/InlineFlowBox.cpp
|
| diff --git a/sky/engine/core/rendering/InlineFlowBox.cpp b/sky/engine/core/rendering/InlineFlowBox.cpp
|
| index 4d0812dd223d3e2b7011f237bc158c95e2b0ab95..df17b5fdb954c3482a5fed2abbe89e9614114bfa 100644
|
| --- a/sky/engine/core/rendering/InlineFlowBox.cpp
|
| +++ b/sky/engine/core/rendering/InlineFlowBox.cpp
|
| @@ -1069,14 +1069,14 @@ bool InlineFlowBox::boxShadowCanBeAppliedToBackground(const FillLayer& lastBackg
|
| // The checks here match how paintFillLayer() decides whether to clip (if it does, the shadow
|
| // would be clipped out, so it has to be drawn separately).
|
| StyleImage* image = lastBackgroundLayer.image();
|
| - bool hasFillImage = image && image->canRender(renderer(), renderer().style()->effectiveZoom());
|
| + bool hasFillImage = image && image->canRender(renderer());
|
| return (!hasFillImage && !renderer().style()->hasBorderRadius()) || (!prevLineBox() && !nextLineBox()) || !parent();
|
| }
|
|
|
| void InlineFlowBox::paintFillLayer(const PaintInfo& paintInfo, const Color& c, const FillLayer& fillLayer, const LayoutRect& rect, CompositeOperator op)
|
| {
|
| StyleImage* img = fillLayer.image();
|
| - bool hasFillImage = img && img->canRender(renderer(), renderer().style()->effectiveZoom());
|
| + bool hasFillImage = img && img->canRender(renderer());
|
| if ((!hasFillImage && !renderer().style()->hasBorderRadius()) || (!prevLineBox() && !nextLineBox()) || !parent()) {
|
| boxModelObject()->paintFillLayerExtended(paintInfo, c, fillLayer, rect, BackgroundBleedNone, this, rect.size(), op);
|
| } else if (renderer().style()->boxDecorationBreak() == DCLONE) {
|
| @@ -1183,7 +1183,7 @@ void InlineFlowBox::paintBoxDecorationBackground(PaintInfo& paintInfo, const Lay
|
| if (parent() && renderer().style()->hasBorder()) {
|
| const NinePieceImage& borderImage = renderer().style()->borderImage();
|
| StyleImage* borderImageSource = borderImage.image();
|
| - bool hasBorderImage = borderImageSource && borderImageSource->canRender(renderer(), styleToUse->effectiveZoom());
|
| + bool hasBorderImage = borderImageSource && borderImageSource->canRender(renderer());
|
| if (hasBorderImage && !borderImageSource->isLoaded())
|
| return; // Don't paint anything while we wait for the image to load.
|
|
|
| @@ -1254,7 +1254,7 @@ void InlineFlowBox::paintMask(PaintInfo& paintInfo, const LayoutPoint& paintOffs
|
| LayoutRect paintRect = LayoutRect(adjustedPaintOffset, frameRect.size());
|
| paintFillLayers(paintInfo, Color::transparent, renderer().style()->maskLayers(), paintRect, compositeOp);
|
|
|
| - bool hasBoxImage = maskBoxImage && maskBoxImage->canRender(renderer(), renderer().style()->effectiveZoom());
|
| + bool hasBoxImage = maskBoxImage && maskBoxImage->canRender(renderer());
|
| if (!hasBoxImage || !maskBoxImage->isLoaded()) {
|
| if (pushTransparencyLayer)
|
| paintInfo.context->endLayer();
|
|
|