Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(350)

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

Issue 1376473002: Move feConvolveMatrix error handling to FEConvolveMatrix (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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
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 a41bdd15a8eaf97a7b4ac2303a304edb854f50f5..20ad4933b4896bf5ffc273249840303247b9dda4 100644
--- a/third_party/WebKit/Source/core/svg/graphics/filters/SVGFEImage.cpp
+++ b/third_party/WebKit/Source/core/svg/graphics/filters/SVGFEImage.cpp
@@ -190,18 +190,17 @@ PassRefPtr<SkImageFilter> FEImage::createImageFilter(SkiaImageFilterBuilder* bui
if (auto* layoutObject = referencedLayoutObject())
return createImageFilterForLayoutObject(*layoutObject, builder);
- FloatRect dstRect = filterPrimitiveSubregion();
-
RefPtr<SkImage> image = m_image ? m_image->imageForCurrentFrame() : nullptr;
if (!image) {
// "A href reference that is an empty image (zero width or zero height), that fails
// to download, is non-existent, or that cannot be displayed (e.g. because it is
// not in a supported image format) fills the filter primitive subregion with
// transparent black."
- return adoptRef(SkPictureImageFilter::Create(nullptr, dstRect));
+ return createTransparentBlack();
}
FloatRect srcRect = FloatRect(FloatPoint(), m_image->size());
+ FloatRect dstRect = filterPrimitiveSubregion();
m_preserveAspectRatio->transformRect(dstRect, srcRect);

Powered by Google App Engine
This is Rietveld 408576698