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

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: fixed-size <svg> 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: 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());
}
« no previous file with comments | « LayoutTests/svg/filters/feimage-invalid-image-expected.svg ('k') | Source/core/svg/graphics/filters/SVGFEImage.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698