third_party/WebKit/Source/core/svg/graphics/filters/SVGFEImage.cpp - Issue 1732563007: [NOT FOR COMMIT] Pass defaultObjectSize to get image size

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/svg/graphics/filters/SVGFEImage.cpp

Issue 1732563007: [NOT FOR COMMIT] Pass defaultObjectSize to get image size (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 months 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/svg/graphics/SVGImageForContainer.cpp ('k') | third_party/WebKit/Source/core/testing/Internals.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/svg/graphics/filters/SVGFEImage.cpp

diff --git a/third_party/WebKit/Source/core/svg/graphics/filters/SVGFEImage.cpp b/third_party/WebKit/Source/core/svg/graphics/filters/SVGFEImage.cpp

index d551f17b1a6ea4eb8b864794b3a8fb537f08070d..099ee49f5a64dee716f7ebdcb71fcc52bb8e15eb 100644

--- a/third_party/WebKit/Source/core/svg/graphics/filters/SVGFEImage.cpp

+++ b/third_party/WebKit/Source/core/svg/graphics/filters/SVGFEImage.cpp

@@ -119,7 +119,7 @@ FloatRect FEImage::determineAbsolutePaintRect(const FloatRect& originalRequested

}

destRect.intersect(srcRect);

} else {

- srcRect = FloatRect(FloatPoint(), FloatSize(m_image->size()));

+ srcRect = FloatRect(FloatPoint(), FloatSize(m_image->defaultConcreteObjectSize()));

m_preserveAspectRatio->transformRect(destRect, srcRect);

}

@@ -142,7 +142,7 @@ TextStream& FEImage::externalRepresentation(TextStream& ts, int indent) const

{

IntSize imageSize;

if (m_image)

- imageSize = m_image->size();

+ imageSize = m_image->defaultConcreteObjectSize();

else if (LayoutObject* layoutObject = referencedLayoutObject())

imageSize = enclosingIntRect(getLayoutObjectRepaintRect(layoutObject)).size();

writeIndent(ts, indent);

@@ -197,7 +197,7 @@ PassRefPtr<SkImageFilter> FEImage::createImageFilter(SkiaImageFilterBuilder& bui

return createTransparentBlack(builder);

}

- FloatRect srcRect = FloatRect(FloatPoint(), FloatSize(m_image->size()));

+ FloatRect srcRect = FloatRect(FloatPoint(), FloatSize(m_image->defaultConcreteObjectSize()));

FloatRect dstRect = filterPrimitiveSubregion();

m_preserveAspectRatio->transformRect(dstRect, srcRect);