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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>
4 * Copyright (C) 2010 Dirk Schulze <krit@webkit.org> 4 * Copyright (C) 2010 Dirk Schulze <krit@webkit.org>
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 Element* parent = parentElement(); 152 Element* parent = parentElement();
153 if (!parent || !isSVGFilterElement(parent) || !parent->layoutObject()) 153 if (!parent || !isSVGFilterElement(parent) || !parent->layoutObject())
154 return; 154 return;
155 155
156 if (LayoutObject* layoutObject = this->layoutObject()) 156 if (LayoutObject* layoutObject = this->layoutObject())
157 markForLayoutAndParentResourceInvalidation(layoutObject); 157 markForLayoutAndParentResourceInvalidation(layoutObject);
158 } 158 }
159 159
160 PassRefPtrWillBeRawPtr<FilterEffect> SVGFEImageElement::build(SVGFilterBuilder*, Filter* filter) 160 PassRefPtrWillBeRawPtr<FilterEffect> SVGFEImageElement::build(SVGFilterBuilder*, Filter* filter)
161 { 161 {
162 if (m_cachedImage) 162 if (m_cachedImage) {
163 return FEImage::createWithImage(filter, m_cachedImage->imageForLayoutObj ect(layoutObject()), m_preserveAspectRatio->currentValue()); 163 // Don't use the broken image icon on image loading errors.
164 RefPtr<Image> image = m_cachedImage->errorOccurred() ?
165 nullptr : m_cachedImage->imageForLayoutObject(layoutObject());
166 return FEImage::createWithImage(filter, image, m_preserveAspectRatio->cu rrentValue());
167 }
168
164 return FEImage::createWithIRIReference(filter, treeScope(), hrefString(), m_ preserveAspectRatio->currentValue()); 169 return FEImage::createWithIRIReference(filter, treeScope(), hrefString(), m_ preserveAspectRatio->currentValue());
165 } 170 }
166 171
167 } 172 }
OLDNEW
« 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