Chromium Code Reviews

Unified Diff: Source/core/svg/SVGFEImageElement.cpp

Issue 1334173004: Switch SVGFEImage from SkBitmapSource to SkImageSource (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: spec compliant + test Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Index: Source/core/svg/SVGFEImageElement.cpp
diff --git a/Source/core/svg/SVGFEImageElement.cpp b/Source/core/svg/SVGFEImageElement.cpp
index b982083e727471397ae271024401ad79a487caff..440520dbcc13dfe605c4b197d85acce44abb0548 100644
--- a/Source/core/svg/SVGFEImageElement.cpp
+++ b/Source/core/svg/SVGFEImageElement.cpp
@@ -159,8 +159,13 @@ void SVGFEImageElement::notifyFinished(Resource*)
PassRefPtrWillBeRawPtr<FilterEffect> SVGFEImageElement::build(SVGFilterBuilder*, Filter* filter)
{
- if (m_cachedImage)
- return FEImage::createWithImage(filter, m_cachedImage->imageForLayoutObject(layoutObject()), m_preserveAspectRatio->currentValue());
+ if (m_cachedImage) {
+ // Don't use the broken image icon on image loading errors.
+ RefPtr<Image> image = m_cachedImage->errorOccurred() ?
+ nullptr : m_cachedImage->imageForLayoutObject(layoutObject());
+ return FEImage::createWithImage(filter, image, m_preserveAspectRatio->currentValue());
+ }
+
return FEImage::createWithIRIReference(filter, treeScope(), hrefString(), m_preserveAspectRatio->currentValue());
}

Powered by Google App Engine