third_party/WebKit/Source/core/paint/BoxPainter.cpp - Issue 1427943002: Wrap SVGImage for container during paint

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/paint/BoxPainter.cpp

Issue 1427943002: Wrap SVGImage for container during paint (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Use IntSize for SVGImageForContainer Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/paint/BackgroundImageGeometry.cpp ('k') | third_party/WebKit/Source/core/paint/ImagePainter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/paint/BoxPainter.cpp

diff --git a/third_party/WebKit/Source/core/paint/BoxPainter.cpp b/third_party/WebKit/Source/core/paint/BoxPainter.cpp

index 3b1f0b38ee6dabdfe748554c65791d4706b57fe1..c56ba6aef747f79079e4d69b08dc94241e8f2e73 100644

--- a/third_party/WebKit/Source/core/paint/BoxPainter.cpp

+++ b/third_party/WebKit/Source/core/paint/BoxPainter.cpp

@@ -437,7 +437,7 @@ void BoxPainter::paintFillLayerExtended(const LayoutBoxModelObject& obj, const P

BackgroundImageGeometry geometry;

if (bgImage)

- geometry.calculate(obj, paintInfo.paintContainer(), paintInfo.globalPaintFlags(), bgLayer, scrolledPaintRect, backgroundObject);

+ geometry.calculate(obj, paintInfo.paintContainer(), paintInfo.globalPaintFlags(), bgLayer, scrolledPaintRect);

bool shouldPaintBackgroundImage = bgImage && bgImage->canRender(obj, obj.style()->effectiveZoom());

// Paint the color first underneath all images, culled if background image occludes it.

@@ -464,7 +464,7 @@ void BoxPainter::paintFillLayerExtended(const LayoutBoxModelObject& obj, const P

// if op != SkXfermode::kSrcOver_Mode, a mask is being painted.

SkXfermode::Mode compositeOp = op == SkXfermode::kSrcOver_Mode ? bgOp : op;

const LayoutObject* clientForBackgroundImage = backgroundObject ? backgroundObject : &obj;

- RefPtr<Image> image = bgImage->image(clientForBackgroundImage, geometry.tileSize());

+ RefPtr<Image> image = bgImage->image(clientForBackgroundImage, geometry.imageContainerSize(), obj.style()->effectiveZoom());

InterpolationQuality interpolationQuality = chooseInterpolationQuality(*clientForBackgroundImage, context, image.get(), &bgLayer, LayoutSize(geometry.tileSize()));

if (bgLayer.maskSourceType() == MaskLuminance)

context->setColorFilter(ColorFilterLuminanceToAlpha);